Refactor e2e test for different log server per disk settings

Author: johscheuer

e2e/fixtures/fdb_cluster.go

@@ -581,11 +581,6 @@ func (fdbCluster *FdbCluster) GetStoragePods() *corev1.PodList {
 	return fdbCluster.getPodsByProcessClass(fdbv1beta2.ProcessClassStorage)
 }
 
-// GetTransactionPods returns all Pods of this cluster that have the process class transaction.
-func (fdbCluster *FdbCluster) GetTransactionPods() *corev1.PodList {
-	return fdbCluster.getPodsByProcessClass(fdbv1beta2.ProcessClassTransaction)
-}
-
 // GetPod returns the Pod with the given name that runs in the same namespace as the FoundationDBCluster.
 func (fdbCluster *FdbCluster) GetPod(name string) *corev1.Pod {
 	pod := &corev1.Pod{}

e2e/test_operator/operator_test.go

@@ -1149,7 +1149,7 @@ var _ = Describe("Operator", Label("e2e", "pr"), func() {
 	})
 
 	When("setting 2 logs per disk", func() {
-		var initialLogServerPerPod, expectedPodCnt, expectedLogProcessesCnt int
+		var initialLogServerPerPod, expectedPodCnt, expectedLogProcessesCnt, serverPerPod int
 
 		BeforeEach(func() {
 			initialLogServerPerPod = fdbCluster.GetLogServersPerPod()
@@ -1164,67 +1164,12 @@ var _ = Describe("Operator", Label("e2e", "pr"), func() {
 			Eventually(func() int {
 				return len(fdbCluster.GetLogPods().Items)
 			}).Should(BeNumerically("==", expectedPodCnt))
-		})
-
-		AfterEach(func() {
-			log.Printf("set log servers per Pod to %d", initialLogServerPerPod)
-			Expect(
-				fdbCluster.SetLogServersPerPod(initialLogServerPerPod, true),
-			).ShouldNot(HaveOccurred())
-			log.Printf(
-				"expectedPodCnt: %d, expectedProcessesCnt: %d",
-				expectedPodCnt,
-				expectedPodCnt*initialLogServerPerPod,
-			)
-			Eventually(func() int {
-				return len(fdbCluster.GetLogPods().Items)
-			}).Should(BeNumerically("==", expectedPodCnt))
-		})
-
-		It("should update the log servers to the expected amount", func() {
-			serverPerPod := initialLogServerPerPod * 2
-			log.Printf("set log servers per Pod to %d", initialLogServerPerPod)
-			Expect(fdbCluster.SetLogServersPerPod(serverPerPod, true)).ShouldNot(HaveOccurred())
-			log.Printf(
-				"expectedPodCnt: %d, expectedStorageProcessesCnt: %d",
-				expectedPodCnt,
-				expectedPodCnt*serverPerPod,
-			)
-			fdbCluster.ValidateProcessesCount(
-				fdbv1beta2.ProcessClassLog,
-				expectedPodCnt,
-				expectedPodCnt*serverPerPod,
-			)
-		})
-	})
-
-	When("setting 2 logs per disk to use transaction process", func() {
-		var initialLogServerPerPod, expectedPodCnt, expectedLogProcessesCnt int
 
-		BeforeEach(func() {
-			initialLogServerPerPod = fdbCluster.GetLogServersPerPod()
-			initialPods := fdbCluster.GetLogPods()
-			expectedPodCnt = len(initialPods.Items)
-			expectedLogProcessesCnt = expectedPodCnt * initialLogServerPerPod
-			log.Printf(
-				"expectedPodCnt: %d, expectedProcessesCnt: %d",
-				expectedPodCnt,
-				expectedLogProcessesCnt,
-			)
-			Eventually(func() int {
-				return len(fdbCluster.GetLogPods().Items)
-			}).Should(BeNumerically("==", expectedPodCnt))
+			serverPerPod = initialLogServerPerPod * 2
+			log.Printf("new log servers per Pod: %d", initialLogServerPerPod)
 		})
 
 		AfterEach(func() {
-			log.Printf("set log servers per Pod to %d", initialLogServerPerPod)
-			Expect(
-				fdbCluster.SetTransactionServerPerPod(
-					initialLogServerPerPod,
-					expectedLogProcessesCnt,
-					true,
-				),
-			).ShouldNot(HaveOccurred())
 			log.Printf(
 				"expectedPodCnt: %d, expectedProcessesCnt: %d",
 				expectedPodCnt,
@@ -1235,29 +1180,71 @@ var _ = Describe("Operator", Label("e2e", "pr"), func() {
 			}).Should(BeNumerically("==", expectedPodCnt))
 		})
 
-		It(
-			"should update the log servers to the expected amount and should create transaction Pods",
-			func() {
-				serverPerPod := initialLogServerPerPod * 2
+		When("when using log servers", func() {
+			AfterEach(func() {
+				log.Printf("set log servers per Pod to %d", initialLogServerPerPod)
 				Expect(
-					fdbCluster.SetTransactionServerPerPod(
-						serverPerPod,
-						expectedLogProcessesCnt,
-						true,
-					),
+					fdbCluster.SetLogServersPerPod(initialLogServerPerPod, true),
 				).ShouldNot(HaveOccurred())
+			})
+
+			BeforeEach(func() {
+				Expect(fdbCluster.SetLogServersPerPod(serverPerPod, true)).ShouldNot(HaveOccurred())
+			})
+
+			It("should update the log servers to the expected amount", func() {
+				Expect(fdbCluster.SetLogServersPerPod(serverPerPod, true)).ShouldNot(HaveOccurred())
 				log.Printf(
 					"expectedPodCnt: %d, expectedProcessesCnt: %d",
 					expectedPodCnt,
 					expectedPodCnt*serverPerPod,
 				)
 				fdbCluster.ValidateProcessesCount(
-					fdbv1beta2.ProcessClassTransaction,
+					fdbv1beta2.ProcessClassLog,
 					expectedPodCnt,
 					expectedPodCnt*serverPerPod,
 				)
-			},
-		)
+			})
+		})
+
+		When("migrating from log processes to transaction processes", func() {
+			AfterEach(func() {
+				log.Printf("set log servers per Pod to %d", initialLogServerPerPod)
+				Expect(
+					fdbCluster.SetTransactionServerPerPod(
+						initialLogServerPerPod,
+						expectedLogProcessesCnt,
+						true,
+					),
+				).ShouldNot(HaveOccurred())
+			})
+
+			BeforeEach(func() {
+				Expect(
+					fdbCluster.SetTransactionServerPerPod(
+						serverPerPod,
+						expectedLogProcessesCnt,
+						true,
+					),
+				).ShouldNot(HaveOccurred())
+			})
+
+			It(
+				"should update the log servers to the expected amount and should create transaction Pods",
+				func() {
+					log.Printf(
+						"expectedPodCnt: %d, expectedProcessesCnt: %d",
+						expectedPodCnt,
+						expectedPodCnt*serverPerPod,
+					)
+					fdbCluster.ValidateProcessesCount(
+						fdbv1beta2.ProcessClassTransaction,
+						expectedPodCnt,
+						expectedPodCnt*serverPerPod,
+					)
+				},
+			)
+		})
 	})
 
 	When("Replacing a Pod with PVC stuck in Terminating state", func() {