github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #71339 from cofyc/fix71301 

Add prebound pvs test cases in integration stress tests
pull/564/head
k8s-ci-robot 2018-11-30 00:04:08 -08:00 committed by GitHub
parent 3e1c0d47c2 37b20f0116
commit 8b6d20ab60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/integration/scheduler/volume_binding_test.go
View File

@ -387,7 +387,7 @@ func TestVolumeBindingRescheduling(t *testing.T) {
}
}
// TestVolumeBindingStress creates <podLimit> pods, each with <volsPerPod> unbound PVCs.
// TestVolumeBindingStress creates <podLimit> pods, each with <volsPerPod> unbound or prebound PVCs.
// PVs are precreated.
func TestVolumeBindingStress(t *testing.T) {
testVolumeBindingStress(t, 0, false, 0)
@ -437,16 +437,31 @@ func testVolumeBindingStress(t *testing.T, schedulerResyncPeriod time.Duration,
pvs := []*v1.PersistentVolume{}
pvcs := []*v1.PersistentVolumeClaim{}
for i := 0; i < podLimit*volsPerPod; i++ {
var (
pv *v1.PersistentVolume
pvc *v1.PersistentVolumeClaim
pvName = fmt.Sprintf("pv-stress-%v", i)
pvcName = fmt.Sprintf("pvc-stress-%v", i)
)
// Don't create pvs for dynamic provisioning test
if !dynamic {
pv := makePV(fmt.Sprintf("pv-stress-%v", i), *scName, "", "", node1)
if rand.Int()%2 == 0 {
// static unbound pvs
pv = makePV(pvName, *scName, "", "", node1)
} else {
// static prebound pvs
pv = makePV(pvName, classImmediate, pvcName, config.ns, node1)
}
if pv, err := config.client.CoreV1().PersistentVolumes().Create(pv); err != nil {
t.Fatalf("Failed to create PersistentVolume %q: %v", pv.Name, err)
}
pvs = append(pvs, pv)
}
pvc := makePVC(fmt.Sprintf("pvc-stress-%v", i), config.ns, scName, "")
if pv != nil && pv.Spec.ClaimRef != nil && pv.Spec.ClaimRef.Name == pvcName {
pvc = makePVC(pvcName, config.ns, &classImmediate, pv.Name)
} else {
pvc = makePVC(pvcName, config.ns, scName, "")
}
if pvc, err := config.client.CoreV1().PersistentVolumeClaims(config.ns).Create(pvc); err != nil {
t.Fatalf("Failed to create PersistentVolumeClaim %q: %v", pvc.Name, err)
}