github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

use shuffle sharding validation in flowcontrol

Browse Source 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
This commit is contained in:
Bruce Ma
2019-08-23 17:24:20 +08:00
committed by Mike Spreitzer
parent 79b587fe8d
commit c4d3ee74fa
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/flowcontrol/validation/BUILD
View File

@@ -11,6 +11,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/api/validation:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/shufflesharding:go_default_library",
],
)

27
pkg/apis/flowcontrol/validation/validation.go
View File

@@ -18,12 +18,13 @@ package validation
import (
"fmt"
"math/big"
"strings"
"k8s.io/apimachinery/pkg/api/validation"
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/util/shufflesharding"
apivalidation "k8s.io/kubernetes/pkg/apis/core/validation"
"k8s.io/kubernetes/pkg/apis/flowcontrol"
)
@@ -55,10 +56,6 @@ var supportedSubjectKinds = sets.NewString(
flowcontrol.GroupKind,
)
const (
maxHashBits = 60
)
func ValidateFlowSchema(fs *flowcontrol.FlowSchema) field.ErrorList {
allErrs := apivalidation.ValidateObjectMeta(&fs.ObjectMeta, false, ValidateFlowSchemaName, field.NewPath("metadata"))
allErrs = append(allErrs, ValidateFlowSchemaSpec(&fs.Spec, field.NewPath("spec"))...)
@@ -217,6 +214,13 @@ func ValidatePriorityLevelConfigurationSpec(spec *flowcontrol.PriorityLevelConfi
if spec.HandSize < 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("handSize"), spec.HandSize, "must be positive"))
}
if spec.HandSize > spec.Queues {
allErrs = append(allErrs, field.Invalid(fldPath.Child("handSize"), spec.HandSize,
fmt.Sprintf("should not be greater than queues (%d)", spec.Queues)))
}
if errs := shufflesharding.ValidateParameters(int(spec.Queues), int(spec.HandSize)); len(errs) > 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("handSize"), spec.HandSize, strings.Join(errs, "; ")))
}
} else {
if spec.AssuredConcurrencyShares != 0 {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("assuredConcurrencyShares"), "must be zero for exempt priority"))
@@ -231,14 +235,6 @@ func ValidatePriorityLevelConfigurationSpec(spec *flowcontrol.PriorityLevelConfi
allErrs = append(allErrs, field.Forbidden(fldPath.Child("handSize"), "must be zero for exempt priority"))
}
}
if spec.HandSize > spec.Queues {
allErrs = append(allErrs, field.Invalid(fldPath.Child("handSize"), spec.HandSize,
fmt.Sprintf("should not be greater than queues (%d)", spec.Queues)))
}
if !validateShuffleShardingParameters(spec.HandSize, spec.Queues) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("handSize"), spec.HandSize,
fmt.Sprintf("falling factorial of handSize (%d) and queues (%d) exceeds %d bits", spec.HandSize, spec.Queues, maxHashBits)))
}
return allErrs
}
@@ -248,11 +244,6 @@ func ValidatePriorityLevelConfigurationStatus(status *flowcontrol.PriorityLevelC
return allErrs
}
func validateShuffleShardingParameters(handSize, queues int32) bool {
// TODO: performance impact from bit-int multiplication?
return int32(big.NewInt(int64(queues)).BitLen())*handSize <= maxHashBits
}
func hasWildcard(operations []string) bool {
for _, o := range operations {
if o == "*" {

8
pkg/apis/flowcontrol/validation/validation_test.go
View File

@@ -416,6 +416,7 @@ func TestPriorityLevelConfigurationValidation(t *testing.T) {
field.Invalid(field.NewPath("spec").Child("assuredConcurrencyShares"), int32(0), "must be positive"),
field.Invalid(field.NewPath("spec").Child("queueLengthLimit"), int32(0), "must be positive"),
field.Invalid(field.NewPath("spec").Child("queues"), int32(0), "must be positive"),
field.Invalid(field.NewPath("spec").Child("handSize"), int32(0), "handSize is not positive; deckSize is not positive"),
},
},
{
@@ -432,7 +433,7 @@ func TestPriorityLevelConfigurationValidation(t *testing.T) {
},
},
expectedErrors: field.ErrorList{
field.Invalid(field.NewPath("spec").Child("handSize"), int32(8), "falling factorial of handSize (8) and queues (512) exceeds 60 bits"),
field.Invalid(field.NewPath("spec").Child("handSize"), int32(8), "more than 60 bits of entropy required"),
},
},
{
@@ -449,7 +450,7 @@ func TestPriorityLevelConfigurationValidation(t *testing.T) {
},
},
expectedErrors: field.ErrorList{
field.Invalid(field.NewPath("spec").Child("handSize"), int32(10), "falling factorial of handSize (10) and queues (128) exceeds 60 bits"),
field.Invalid(field.NewPath("spec").Child("handSize"), int32(10), "more than 60 bits of entropy required"),
},
},
{
@@ -466,7 +467,7 @@ func TestPriorityLevelConfigurationValidation(t *testing.T) {
},
},
expectedErrors: field.ErrorList{
field.Invalid(field.NewPath("spec").Child("handSize"), int32(3), "falling factorial of handSize (3) and queues (2147483647) exceeds 60 bits"),
field.Invalid(field.NewPath("spec").Child("handSize"), int32(3), "more than 60 bits of entropy required"),
},
},
{
@@ -499,6 +500,7 @@ func TestPriorityLevelConfigurationValidation(t *testing.T) {
},
expectedErrors: field.ErrorList{
field.Invalid(field.NewPath("spec").Child("handSize"), int32(8), "should not be greater than queues (7)"),
field.Invalid(field.NewPath("spec").Child("handSize"), int32(8), "handSize is greater than deckSize"),
},
},
}