Skip to content

Validate resources.request.storage for each item in spec.tiflash.storageClaims #4635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hoyhbx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Validate resources.request.storage for each item in spec.tiflash.storageClaims #4635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebdd0e2
validate storageClaims in tiflash
hoyhbx Jul 18, 2022
b351275
Merge branch 'pingcap:master' into FixTiFlashStorage
hoyhbx Apr 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/apis/pingcap/v1alpha1/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,14 @@ func validateTiFlashSpec(spec *v1alpha1.TiFlashSpec, fldPath *field.Path) field.
spec.StorageClaims, "storageClaims should be configured at least one item."))
}
allErrs = append(allErrs, validateScalePolicy(&spec.ScalePolicy, fldPath.Child("scalePolicy"))...)

// fix storageClaim
for _, storageClaim := range spec.StorageClaims {
if _, ok := storageClaim.Resources.Requests["storage"]; !ok {
allErrs = append(allErrs, field.Invalid(fldPath.Child("spec.StorageClaims.Resources.Requests"),
spec.StorageClaims, "spec.tiflash.storageClaims.resources[storage]: Required value."))
}
}
return allErrs
}

Expand Down
64 changes: 64 additions & 0 deletions pkg/apis/pingcap/v1alpha1/validation/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,62 @@ func TestValidatePumpSpec(t *testing.T) {
}
}

func TestValidateTiFlashSpec(t *testing.T) {
g := NewGomegaWithT(t)
tests := []struct {
name string
replicas int32
expectedErrors int
storageClaims []v1alpha1.StorageClaim
}{
{
name: "has storage request",
replicas: 1,
expectedErrors: 0,
storageClaims: []v1alpha1.StorageClaim{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: resource.MustParse("10G"),
},
},
},
},
},
{
name: "no storage request",
replicas: 1,
expectedErrors: 3,
storageClaims: []v1alpha1.StorageClaim{
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{},
},
},
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{},
},
},
{
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{},
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tc := newTidbClusterWithTiflash()
tc.Spec.TiFlash.StorageClaims = tt.storageClaims
err := validateTiFlashSpec(tc.Spec.TiFlash, field.NewPath("spec", "tiflash"))
r := len(err)
g.Expect(r).Should(Equal(tt.expectedErrors))
})
}
}

func TestValidateRequestsStorage(t *testing.T) {
g := NewGomegaWithT(t)
tests := []struct {
Expand Down Expand Up @@ -548,6 +604,14 @@ func newTidbCluster() *v1alpha1.TidbCluster {
return tc
}

func newTidbClusterWithTiflash() *v1alpha1.TidbCluster {
tc := newTidbCluster()
tc.Spec.TiFlash = &v1alpha1.TiFlashSpec{
Replicas: 1,
}
return tc
}

func newService() *v1alpha1.ServiceSpec {
svc := &v1alpha1.ServiceSpec{}
return svc
Expand Down