Skip to content

Commit 2e52a6f

Browse files
Aishwarya-HebbarAishwarya-Hebbar
committed
vsan stretch cluster fixes
1 parent 8b5cc66 commit 2e52a6f

4 files changed

+36
-68
lines changed

‎tests/e2e/vm_service_vsan_stretch_cluster.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
467467
ch := make(chan *vmopv1.VirtualMachine)
468468
var wg sync.WaitGroup
469469
var lock sync.Mutex
470-
done := make(chan bool)
471470
ginkgo.By("Creating VM in parallel to site failure")
472471
wg.Add(2)
473472
go createVMServiceVmInParallel(ctx, vmopC, namespace, vmClass, pvclaimsList,
@@ -477,7 +476,7 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
477476
vms = append(vms, v)
478477
}
479478
}()
480-
go siteFailureInParallel(ctx, true, &wg, done)
479+
go siteFailureInParallel(ctx, true, &wg)
481480
wg.Wait()
482481
close(ch)
483482

@@ -623,10 +622,9 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
623622

624623
var wg sync.WaitGroup
625624
ginkgo.By("Deleting VM in parallel to secondary site failure")
626-
done := make(chan bool)
627625
wg.Add(2)
628626
go deleteVMServiceVmInParallel(ctx, vmopC, vms, namespace, &wg)
629-
go siteFailureInParallel(ctx, false, &wg, done)
627+
go siteFailureInParallel(ctx, false, &wg)
630628
wg.Wait()
631629

632630
defer func() {

‎tests/e2e/vmservice_utils.go

+1
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,7 @@ func deleteVMServiceVmInParallel(ctx context.Context, c ctlrclient.Client,
11081108

11091109
defer wg.Done()
11101110
for _, vm := range vms {
1111+
framework.Logf("Deleting VM: %s", vm.Name)
11111112
err := c.Delete(ctx, &vmopv1.VirtualMachine{ObjectMeta: metav1.ObjectMeta{
11121113
Name: vm.Name,
11131114
Namespace: namespace,

‎tests/e2e/vsan_stretched_cluster.go

+21-56
Original file line numberDiff line numberDiff line change
@@ -738,8 +738,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
738738
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
739739
} else {
740740
gomega.Expect(err).NotTo(gomega.HaveOccurred())
741-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
742-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
743741
}
744742

745743
}
@@ -769,8 +767,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
769767
var wg sync.WaitGroup
770768
done := make(chan bool)
771769
wg.Add(2)
772-
go deletePodsInParallel(ctx, client, namespace, pods, &wg)
773-
go siteFailureInParallel(ctx, true, &wg, done)
770+
go deletePodsInParallel(ctx, client, namespace, pods, &wg, done)
771+
go siteFailureInParallel(ctx, true, &wg)
774772
wg.Wait()
775773

776774
defer func() {
@@ -863,15 +861,14 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
863861
var wg sync.WaitGroup
864862
ch := make(chan *v1.PersistentVolumeClaim)
865863
lock := &sync.Mutex{}
866-
done := make(chan bool)
867864
wg.Add(2)
868865
go createPvcInParallel(ctx, client, namespace, diskSize, sc, ch, lock, &wg, volumeOpsScale)
869866
go func() {
870867
for v := range ch {
871868
pvclaims = append(pvclaims, v)
872869
}
873870
}()
874-
go siteFailureInParallel(ctx, true, &wg, done)
871+
go siteFailureInParallel(ctx, true, &wg)
875872
wg.Wait()
876873
close(ch)
877874

@@ -1045,8 +1042,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
10451042
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
10461043
} else {
10471044
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1048-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
1049-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
10501045
}
10511046
}
10521047
}()
@@ -1205,10 +1200,9 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
12051200

12061201
ginkgo.By("Bring down the primary site while deleting pvcs")
12071202
var wg sync.WaitGroup
1208-
done := make(chan bool)
12091203
wg.Add(2)
1210-
go deletePvcInParallel(ctx, client, pvclaims, namespace, &wg, done)
1211-
go siteFailureInParallel(ctx, true, &wg, done)
1204+
go deletePvcInParallel(ctx, client, pvclaims, namespace, &wg)
1205+
go siteFailureInParallel(ctx, true, &wg)
12121206
wg.Wait()
12131207

12141208
defer func() {
@@ -1243,9 +1237,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
12431237
volumeHandle := pv.Spec.CSI.VolumeHandle
12441238
err := fpv.WaitForPersistentVolumeDeleted(ctx, client, pv.Name, poll,
12451239
pollTimeout)
1246-
eventList, _ := client.CoreV1().Events(namespace).List(ctx,
1247-
metav1.ListOptions{FieldSelector: fmt.Sprintf("involvedObject.name=%s", pv.Name)})
1248-
framework.Logf("events for PV: %v", eventList)
12491240
errMsg := "The object or item referred to could not be found"
12501241
if err != nil && checkForEventWithMessage(client, "", pv.Name, errMsg) {
12511242
framework.Logf("Persistent Volume %v still not deleted with err %v", pv.Name, errMsg)
@@ -1254,8 +1245,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
12541245
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
12551246
} else {
12561247
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1257-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
1258-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
12591248
}
12601249

12611250
}
@@ -1353,15 +1342,14 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
13531342
var wg sync.WaitGroup
13541343
wg.Add(2)
13551344
ch := make(chan *v1.Pod)
1356-
done := make(chan bool)
13571345
lock := &sync.Mutex{}
13581346
go createPodsInParallel(client, namespace, pvclaims, ctx, lock, ch, &wg, volumeOpsScale)
13591347
go func() {
13601348
for v := range ch {
13611349
pods = append(pods, v)
13621350
}
13631351
}()
1364-
go siteFailureInParallel(ctx, true, &wg, done)
1352+
go siteFailureInParallel(ctx, true, &wg)
13651353
wg.Wait()
13661354
close(ch)
13671355

@@ -1508,13 +1496,12 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
15081496

15091497
ginkgo.By("Bring down the primary site while adding labels to PVCs and PVs")
15101498
var wg sync.WaitGroup
1511-
done := make(chan bool)
15121499
labels := make(map[string]string)
15131500
labels[labelKey] = labelValue
15141501
wg.Add(3)
15151502
go updatePvcLabelsInParallel(ctx, client, namespace, labels, pvclaims, &wg)
15161503
go updatePvLabelsInParallel(ctx, client, namespace, labels, persistentvolumes, &wg)
1517-
go siteFailureInParallel(ctx, true, &wg, done)
1504+
go siteFailureInParallel(ctx, true, &wg)
15181505
wg.Wait()
15191506

15201507
if vanillaCluster {
@@ -1626,15 +1613,14 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
16261613
var wg sync.WaitGroup
16271614
ch := make(chan *v1.PersistentVolumeClaim)
16281615
lock := &sync.Mutex{}
1629-
done := make(chan bool)
16301616
wg.Add(2)
16311617
go createPvcInParallel(ctx, client, namespace, diskSize, sc, ch, lock, &wg, volumeOpsScale)
16321618
go func() {
16331619
for v := range ch {
16341620
pvclaims = append(pvclaims, v)
16351621
}
16361622
}()
1637-
go siteFailureInParallel(ctx, false, &wg, done)
1623+
go siteFailureInParallel(ctx, false, &wg)
16381624
wg.Wait()
16391625
close(ch)
16401626

@@ -1745,10 +1731,9 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
17451731

17461732
ginkgo.By("Bring down the secondary site while deleting pvcs")
17471733
var wg sync.WaitGroup
1748-
done := make(chan bool)
17491734
wg.Add(2)
1750-
go deletePvcInParallel(ctx, client, pvclaims, namespace, &wg, done)
1751-
go siteFailureInParallel(ctx, false, &wg, done)
1735+
go deletePvcInParallel(ctx, client, pvclaims, namespace, &wg)
1736+
go siteFailureInParallel(ctx, false, &wg)
17521737
wg.Wait()
17531738

17541739
defer func() {
@@ -1782,9 +1767,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
17821767
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
17831768
} else {
17841769
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1785-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
1786-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1787-
// TODO: List orphan volumes
17881770
}
17891771
}
17901772
ginkgo.By("Bring up the secondary site")
@@ -1881,8 +1863,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
18811863
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
18821864
} else {
18831865
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1884-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
1885-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
18861866
}
18871867
}
18881868
}()
@@ -1896,14 +1876,13 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
18961876
wg.Add(2)
18971877
ch := make(chan *v1.Pod)
18981878
lock := &sync.Mutex{}
1899-
done := make(chan bool)
19001879
go createPodsInParallel(client, namespace, pvclaims, ctx, lock, ch, &wg, volumeOpsScale)
19011880
go func() {
19021881
for v := range ch {
19031882
pods = append(pods, v)
19041883
}
19051884
}()
1906-
go siteFailureInParallel(ctx, false, &wg, done)
1885+
go siteFailureInParallel(ctx, false, &wg)
19071886
wg.Wait()
19081887
close(ch)
19091888

@@ -2048,8 +2027,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
20482027
var wg sync.WaitGroup
20492028
done := make(chan bool)
20502029
wg.Add(2)
2051-
go deletePodsInParallel(ctx, client, namespace, pods, &wg)
2052-
go siteFailureInParallel(ctx, false, &wg, done)
2030+
go deletePodsInParallel(ctx, client, namespace, pods, &wg, done)
2031+
go siteFailureInParallel(ctx, false, &wg)
20532032
wg.Wait()
20542033

20552034
defer func() {
@@ -2921,12 +2900,11 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
29212900
var wg sync.WaitGroup
29222901
labels := make(map[string]string)
29232902
labels[labelKey] = labelValue
2924-
done := make(chan bool)
29252903

29262904
wg.Add(3)
29272905
go updatePvcLabelsInParallel(ctx, client, namespace, labels, pvclaims, &wg)
29282906
go updatePvLabelsInParallel(ctx, client, namespace, labels, persistentvolumes, &wg)
2929-
go siteFailureInParallel(ctx, false, &wg, done)
2907+
go siteFailureInParallel(ctx, false, &wg)
29302908
wg.Wait()
29312909

29322910
ginkgo.By("Wait for k8s cluster to be healthy")
@@ -3268,10 +3246,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
32683246
}
32693247
}()
32703248

3271-
// Get the list of csi pods running in CSI namespace
3272-
/*csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
3273-
gomega.Expect(err).NotTo(gomega.HaveOccurred())*/
3274-
32753249
replicas1 += 2
32763250
ginkgo.By(fmt.Sprintf("Scaling up statefulset %v to number of Replica: %v", statefulset1.Name, replicas1))
32773251
fss.UpdateReplicas(ctx, client, statefulset1, replicas1)
@@ -3443,8 +3417,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
34433417
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
34443418
} else {
34453419
gomega.Expect(err).NotTo(gomega.HaveOccurred())
3446-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
3447-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
34483420
}
34493421
}
34503422
}()
@@ -3474,19 +3446,18 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
34743446
var wg sync.WaitGroup
34753447
ch := make(chan *v1.PersistentVolumeClaim)
34763448
lock := &sync.Mutex{}
3477-
done := make(chan bool)
34783449
wg.Add(5)
34793450
go scaleStsReplicaInParallel(ctx, client, stsList, prefix1, replicas1, &wg)
34803451
go scaleStsReplicaInParallel(ctx, client, stsList, prefix2, replicas2, &wg)
3481-
go deletePvcInParallel(ctx, client, pvclaims, namespace, &wg, done)
3452+
go deletePvcInParallel(ctx, client, pvclaims, namespace, &wg)
34823453
go createPvcInParallel(ctx, client, namespace, diskSize, sc, ch, lock, &wg, operationStormScale)
34833454
go func() {
34843455
for v := range ch {
34853456
pvcList = append(pvcList, v)
34863457
}
34873458
}()
34883459

3489-
go siteFailureInParallel(ctx, false, &wg, done)
3460+
go siteFailureInParallel(ctx, false, &wg)
34903461
wg.Wait()
34913462
close(ch)
34923463

@@ -3643,8 +3614,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
36433614
framework.Logf("Volume %v still not deleted from CNS with err %v", pv.Name, errMsg)
36443615
} else {
36453616
gomega.Expect(err).NotTo(gomega.HaveOccurred())
3646-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volumeHandle)
3647-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
36483617
}
36493618
}
36503619
}()
@@ -3790,11 +3759,10 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
37903759

37913760
ginkgo.By("Bring down the secondary site while deleting pv")
37923761
var wg sync.WaitGroup
3793-
done := make(chan bool)
37943762
wg.Add(3)
3795-
go deletePvcInParallel(ctx, client, pvcs, namespace, &wg, done)
3763+
go deletePvcInParallel(ctx, client, pvcs, namespace, &wg)
37963764
go deletePvInParallel(ctx, client, pvs, &wg)
3797-
go siteFailureInParallel(ctx, false, &wg, done)
3765+
go siteFailureInParallel(ctx, false, &wg)
37983766
wg.Wait()
37993767

38003768
defer func() {
@@ -3977,7 +3945,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
39773945
var wg sync.WaitGroup
39783946
ch := make(chan *v1.PersistentVolumeClaim)
39793947
lock := &sync.Mutex{}
3980-
done := make(chan bool)
39813948
wg.Add(2)
39823949
if vanillaCluster {
39833950
go createStaticPvAndPvcInParallel(client, ctx, fcdIDs, ch, namespace, &wg, volumeOpsScale)
@@ -3990,7 +3957,7 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
39903957
pvclaims = append(pvclaims, v)
39913958
}
39923959
}()
3993-
go siteFailureInParallel(ctx, false, &wg, done)
3960+
go siteFailureInParallel(ctx, false, &wg)
39943961
wg.Wait()
39953962
close(ch)
39963963

@@ -4373,7 +4340,6 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
43734340

43744341
csipods, err := client.CoreV1().Pods(csiSystemNamespace).List(ctx, metav1.ListOptions{})
43754342
gomega.Expect(err).NotTo(gomega.HaveOccurred())
4376-
done := make(chan bool)
43774343
if vanillaCluster {
43784344
// Get restConfig.
43794345
restConfig := getRestConfigClient()
@@ -4385,7 +4351,7 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
43854351

43864352
wg.Add(2)
43874353
go triggerFullSyncInParallel(ctx, cnsOperatorClient, &wg)
4388-
go siteFailureInParallel(ctx, true, &wg, done)
4354+
go siteFailureInParallel(ctx, true, &wg)
43894355
wg.Wait()
43904356
} else {
43914357
framework.Logf("Sleeping full-sync interval time")
@@ -4749,10 +4715,9 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
47494715
enableFullSyncTriggerFss(ctx, client, csiSystemNamespace, fullSyncFss)
47504716
ginkgo.By("Bring down the secondary site while full sync is going on")
47514717
var wg sync.WaitGroup
4752-
done := make(chan bool)
47534718
wg.Add(2)
47544719
go triggerFullSyncInParallel(ctx, cnsOperatorClient, &wg)
4755-
go siteFailureInParallel(ctx, false, &wg, done)
4720+
go siteFailureInParallel(ctx, false, &wg)
47564721
wg.Wait()
47574722

47584723
defer func() {

0 commit comments

Comments
 (0)