Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f4380f69
Commit
f4380f69
authored
Aug 29, 2016
by
deads2k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make deep copy of quota objects before mutations
parent
8675adf1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
8 deletions
+30
-8
controller.go
plugin/pkg/admission/resourcequota/controller.go
+30
-8
No files found.
plugin/pkg/admission/resourcequota/controller.go
View file @
f4380f69
...
@@ -194,8 +194,11 @@ func (e *quotaEvaluator) checkAttributes(ns string, admissionAttributes []*admis
...
@@ -194,8 +194,11 @@ func (e *quotaEvaluator) checkAttributes(ns string, admissionAttributes []*admis
// documents for these waiters have already been evaluated. Step 1, will mark all the ones that should already have succeeded.
// documents for these waiters have already been evaluated. Step 1, will mark all the ones that should already have succeeded.
func
(
e
*
quotaEvaluator
)
checkQuotas
(
quotas
[]
api
.
ResourceQuota
,
admissionAttributes
[]
*
admissionWaiter
,
remainingRetries
int
)
{
func
(
e
*
quotaEvaluator
)
checkQuotas
(
quotas
[]
api
.
ResourceQuota
,
admissionAttributes
[]
*
admissionWaiter
,
remainingRetries
int
)
{
// yet another copy to compare against originals to see if we actually have deltas
// yet another copy to compare against originals to see if we actually have deltas
originalQuotas
:=
make
([]
api
.
ResourceQuota
,
len
(
quotas
),
len
(
quotas
))
originalQuotas
,
err
:=
copyQuotas
(
quotas
)
copy
(
originalQuotas
,
quotas
)
if
err
!=
nil
{
utilruntime
.
HandleError
(
err
)
return
}
atLeastOneChanged
:=
false
atLeastOneChanged
:=
false
for
i
:=
range
admissionAttributes
{
for
i
:=
range
admissionAttributes
{
...
@@ -210,7 +213,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
...
@@ -210,7 +213,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
// that means that no quota docs applied, so it can get a pass
// that means that no quota docs applied, so it can get a pass
atLeastOneChangeForThisWaiter
:=
false
atLeastOneChangeForThisWaiter
:=
false
for
j
:=
range
newQuotas
{
for
j
:=
range
newQuotas
{
if
!
quota
.
Equals
(
originalQ
uotas
[
j
]
.
Status
.
Used
,
newQuotas
[
j
]
.
Status
.
Used
)
{
if
!
quota
.
Equals
(
q
uotas
[
j
]
.
Status
.
Used
,
newQuotas
[
j
]
.
Status
.
Used
)
{
atLeastOneChanged
=
true
atLeastOneChanged
=
true
atLeastOneChangeForThisWaiter
=
true
atLeastOneChangeForThisWaiter
=
true
break
break
...
@@ -220,6 +223,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
...
@@ -220,6 +223,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
if
!
atLeastOneChangeForThisWaiter
{
if
!
atLeastOneChangeForThisWaiter
{
admissionAttribute
.
result
=
nil
admissionAttribute
.
result
=
nil
}
}
quotas
=
newQuotas
quotas
=
newQuotas
}
}
...
@@ -236,6 +240,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
...
@@ -236,6 +240,7 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
var
lastErr
error
var
lastErr
error
for
i
:=
range
quotas
{
for
i
:=
range
quotas
{
newQuota
:=
quotas
[
i
]
newQuota
:=
quotas
[
i
]
// if this quota didn't have its status changed, skip it
// if this quota didn't have its status changed, skip it
if
quota
.
Equals
(
originalQuotas
[
i
]
.
Status
.
Used
,
newQuota
.
Status
.
Used
)
{
if
quota
.
Equals
(
originalQuotas
[
i
]
.
Status
.
Used
,
newQuota
.
Status
.
Used
)
{
continue
continue
...
@@ -297,6 +302,19 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
...
@@ -297,6 +302,19 @@ func (e *quotaEvaluator) checkQuotas(quotas []api.ResourceQuota, admissionAttrib
e
.
checkQuotas
(
quotasToCheck
,
admissionAttributes
,
remainingRetries
-
1
)
e
.
checkQuotas
(
quotasToCheck
,
admissionAttributes
,
remainingRetries
-
1
)
}
}
func
copyQuotas
(
in
[]
api
.
ResourceQuota
)
([]
api
.
ResourceQuota
,
error
)
{
out
:=
make
([]
api
.
ResourceQuota
,
0
,
len
(
in
))
for
_
,
quota
:=
range
in
{
copied
,
err
:=
api
.
Scheme
.
Copy
(
&
quota
)
if
err
!=
nil
{
return
nil
,
err
}
out
=
append
(
out
,
*
copied
.
(
*
api
.
ResourceQuota
))
}
return
out
,
nil
}
// checkRequest verifies that the request does not exceed any quota constraint. it returns back a copy of quotas not yet persisted
// checkRequest verifies that the request does not exceed any quota constraint. it returns back a copy of quotas not yet persisted
// that capture what the usage would be if the request succeeded. It return an error if the is insufficient quota to satisfy the request
// that capture what the usage would be if the request succeeded. It return an error if the is insufficient quota to satisfy the request
func
(
e
*
quotaEvaluator
)
checkRequest
(
quotas
[]
api
.
ResourceQuota
,
a
admission
.
Attributes
)
([]
api
.
ResourceQuota
,
error
)
{
func
(
e
*
quotaEvaluator
)
checkRequest
(
quotas
[]
api
.
ResourceQuota
,
a
admission
.
Attributes
)
([]
api
.
ResourceQuota
,
error
)
{
...
@@ -329,8 +347,7 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
...
@@ -329,8 +347,7 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
hardResources
:=
quota
.
ResourceNames
(
resourceQuota
.
Status
.
Hard
)
hardResources
:=
quota
.
ResourceNames
(
resourceQuota
.
Status
.
Hard
)
evaluatorResources
:=
evaluator
.
MatchesResources
()
evaluatorResources
:=
evaluator
.
MatchesResources
()
requiredResources
:=
quota
.
Intersection
(
hardResources
,
evaluatorResources
)
requiredResources
:=
quota
.
Intersection
(
hardResources
,
evaluatorResources
)
err
:=
evaluator
.
Constraints
(
requiredResources
,
inputObject
)
if
err
:=
evaluator
.
Constraints
(
requiredResources
,
inputObject
);
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
admission
.
NewForbidden
(
a
,
fmt
.
Errorf
(
"failed quota: %s: %v"
,
resourceQuota
.
Name
,
err
))
return
nil
,
admission
.
NewForbidden
(
a
,
fmt
.
Errorf
(
"failed quota: %s: %v"
,
resourceQuota
.
Name
,
err
))
}
}
if
!
hasUsageStats
(
&
resourceQuota
)
{
if
!
hasUsageStats
(
&
resourceQuota
)
{
...
@@ -382,8 +399,13 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
...
@@ -382,8 +399,13 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
return
quotas
,
nil
return
quotas
,
nil
}
}
outQuotas
,
err
:=
copyQuotas
(
quotas
)
if
err
!=
nil
{
return
nil
,
err
}
for
_
,
index
:=
range
interestingQuotaIndexes
{
for
_
,
index
:=
range
interestingQuotaIndexes
{
resourceQuota
:=
q
uotas
[
index
]
resourceQuota
:=
outQ
uotas
[
index
]
hardResources
:=
quota
.
ResourceNames
(
resourceQuota
.
Status
.
Hard
)
hardResources
:=
quota
.
ResourceNames
(
resourceQuota
.
Status
.
Hard
)
requestedUsage
:=
quota
.
Mask
(
deltaUsage
,
hardResources
)
requestedUsage
:=
quota
.
Mask
(
deltaUsage
,
hardResources
)
...
@@ -403,10 +425,10 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
...
@@ -403,10 +425,10 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
}
}
// update to the new usage number
// update to the new usage number
q
uotas
[
index
]
.
Status
.
Used
=
newUsage
outQ
uotas
[
index
]
.
Status
.
Used
=
newUsage
}
}
return
q
uotas
,
nil
return
outQ
uotas
,
nil
}
}
func
(
e
*
quotaEvaluator
)
Evaluate
(
a
admission
.
Attributes
)
error
{
func
(
e
*
quotaEvaluator
)
Evaluate
(
a
admission
.
Attributes
)
error
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment