fix

Author: piotrszyma

test/e2e/internal/tests/parallelarchive/fixtures.go

@@ -47,7 +47,7 @@ func createParallelArchiveTestResources(namespace string, maxParallel int) paral
 	resources.ObjectStoreResources = objectstore.NewMinioObjectStoreResources(namespace, minio)
 	resources.Archive = objectstore.NewMinioArchive(namespace, archiveName, minio, maxParallel)
 	resources.Cluster = createClusterWithArchive(namespace, clusterName, archiveName)
-	resources.Backup = newPluginBackup(namespace)
+	resources.Backup = createPluginBackup(namespace)
 
 	return resources
 }
@@ -88,32 +88,9 @@ func createClusterWithArchive(namespace, clusterName, archiveName string) *cloud
 	return cluster
 }
 
-// createInitialBackup creates a backup resource to initialize the pgBackRest stanza
-func createInitialBackup(namespace, clusterName string) *cloudnativepgv1.Backup {
-	return &cloudnativepgv1.Backup{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Backup",
-			APIVersion: "postgresql.cnpg.io/v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "initial-backup",
-			Namespace: namespace,
-		},
-		Spec: cloudnativepgv1.BackupSpec{
-			Cluster: cloudnativepgv1.LocalObjectReference{
-				Name: clusterName,
-			},
-			Method: "plugin",
-			Target: "primary",
-			PluginConfiguration: &cloudnativepgv1.BackupPluginConfiguration{
-				Name: "pgbackrest.cnpg.opera.com",
-			},
-		},
-	}
-}
-
-func newPluginBackup(namespace string) *cloudnativepgv1.Backup {
-	return &cloudnativepgv1.Backup{
+// createPluginBackup creates a backup resource to initialize the pgBackRest stanza
+func createPluginBackup(namespace string) *cloudnativepgv1.Backup {
+	backup := &cloudnativepgv1.Backup{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Backup",
 			APIVersion: "postgresql.cnpg.io/v1",
@@ -134,4 +111,5 @@ func newPluginBackup(namespace string) *cloudnativepgv1.Backup {
 			},
 		},
 	}
+	return backup
 }

test/e2e/internal/tests/parallelarchive/parallel_archive.go

@@ -90,23 +90,11 @@ var _ = Describe("Parallel WAL Archive", func() {
 			cfg,
 			command.ContainerLocator{
 				NamespaceName: cluster.Namespace,
-				PodName:       fmt.Sprintf("%v-1", cluster.Name),
+				PodName:       fmt.Sprintf("%s-1", cluster.Name),
 				ContainerName: "postgres",
 			},
 			nil,
-			[]string{"psql", "-tAc", "CREATE TABLE parallel_test (id int, data text, created_at timestamp DEFAULT now());"})
-		Expect(err).NotTo(HaveOccurred())
-
-		_, _, err = command.ExecuteInContainer(ctx,
-			*clientSet,
-			cfg,
-			command.ContainerLocator{
-				NamespaceName: cluster.Namespace,
-				PodName:       fmt.Sprintf("%v-1", cluster.Name),
-				ContainerName: "postgres",
-			},
-			nil,
-			[]string{"psql", "-tAc", "INSERT INTO parallel_test (id, data) VALUES (0, 'before_backup');"})
+			[]string{"psql", "-tAc", "CREATE TABLE parallel_test (id int, data text);"})
 		Expect(err).NotTo(HaveOccurred())
 
 		By("creating a backup to initialize pgBackRest stanza")
@@ -123,7 +111,7 @@ var _ = Describe("Parallel WAL Archive", func() {
 		By("rapidly generating multiple WAL files to queue them for archiving")
 		// Generate 10 WAL switches in quick succession to create a backlog
 		// that can be processed in parallel
-		for i := 1; i <= 10; i++ {
+		for i := 0; i < 10; i++ {
 			_, _, err := command.ExecuteInContainer(ctx,
 				*clientSet,
 				cfg,