wip

Signed-off-by: Kohya Shiozaki <[email protected]>

Author: skoya76

test/e2e/full_backup_test.go

@@ -1,6 +1,7 @@
 package e2e
 
 import (
+	"path/filepath"
 	"time"
 
 	finv1 "github.com/cybozu-go/fin/api/v1"
@@ -51,6 +52,11 @@ func fullBackupTestSuite() {
 	It("should create full backup", func(ctx SpecContext) {
 		finbackup = CreateBackup(ctx, ctrlClient, rookNamespace, pvc, nodes[0])
 
+		By("verifying checksum file is created")
+		rawChecksumPath := filepath.Join("/fin", pvc.Namespace, pvc.Name, "raw.img.csum")
+		_, stderr, err := minikubeSSH(nodes[0], nil, "test", "-f", rawChecksumPath)
+		Expect(err).NotTo(HaveOccurred(), "raw.img.csum should exist. stderr: "+string(stderr))
+
 		VerifyRawImage(pvc, nodes[0], writtenData)
 	})
 
@@ -205,6 +211,19 @@ func fullBackupTestSuite() {
 			Expect(err).NotTo(HaveOccurred())
 		}
 
+		By("deleting the backup and verifying checksum file is also removed")
+		if finbackup != nil {
+			err = DeleteFinBackup(ctx, ctrlClient, finbackup)
+			Expect(err).NotTo(HaveOccurred())
+			err = WaitForFinBackupDeletion(ctx, ctrlClient, finbackup, 2*time.Minute)
+			Expect(err).NotTo(HaveOccurred())
+
+			By("verifying checksum file is deleted")
+			rawChecksumPath := filepath.Join("/fin", pvc.Namespace, pvc.Name, "raw.img.csum")
+			_, _, err := minikubeSSH(nodes[0], nil, "test", "!", "-e", rawChecksumPath)
+			Expect(err).NotTo(HaveOccurred(), "raw.img.csum should be deleted")
+		}
+
 		By("deleting the pod to write data to the PVC")
 		err = DeletePod(ctx, k8sClient, podForBackupTargetPVC)
 		Expect(err).NotTo(HaveOccurred())

test/e2e/incremental_test.go

@@ -106,6 +106,11 @@ func incrementalBackupTestSuite() {
 		Expect(err).NotTo(HaveOccurred(), "stderr: "+string(stderr))
 		Expect(rawImageData).To(Equal(dataOnFullBackup), "Data in raw.img does not match the expected data")
 
+		By("verifying the existence of checksum files")
+		rawChecksumPath := filepath.Join(volumePath, "raw.img.csum")
+		_, stderr, err = minikubeSSH(nodes[0], nil, "test", "-f", rawChecksumPath)
+		Expect(err).NotTo(HaveOccurred(), "raw.img.csum should exist. stderr: "+string(stderr))
+
 		By("verifying the existence of the diff file")
 		Expect(ctrlClient.Get(ctx, client.ObjectKeyFromObject(finbackup2), finbackup2)).NotTo(HaveOccurred())
 		_, stderr, err = minikubeSSH(nodes[0], nil,
@@ -226,14 +231,19 @@ func incrementalBackupTestSuite() {
 		err = ctrlClient.Get(ctx, client.ObjectKeyFromObject(finbackup2), &dummy)
 		Expect(err).NotTo(HaveOccurred())
 
-		By("verifying the non-existence of the diff file")
+		By("verifying the non-existence of the diff file and its checksum")
 		Expect(ctrlClient.Get(ctx, client.ObjectKeyFromObject(finbackup2), finbackup2)).NotTo(HaveOccurred())
 		var stderr []byte
 		_, stderr, err = minikubeSSH(nodes[0], nil,
 			"ls", filepath.Join(volumePath, "diff", strconv.Itoa(*finbackup2.Status.SnapID), "part-0"))
-		Expect(err).To(HaveOccurred(), "stderr: "+string(stderr), "diff file does not exist")
+		Expect(err).To(HaveOccurred(), "stderr: "+string(stderr), "diff file should not exist")
 		ExpectDiffChecksumNotExists(nodes[0], finbackup2, pvc)
 
+		By("verifying raw.img.csum still exists after merge")
+		rawChecksumPath := filepath.Join(volumePath, "raw.img.csum")
+		_, stderr, err = minikubeSSH(nodes[0], nil, "test", "-f", rawChecksumPath)
+		Expect(err).NotTo(HaveOccurred(), "raw.img.csum should still exist after merge. stderr: "+string(stderr))
+
 		By("verifying the data in raw.img as incremental backup")
 		var rawImageData []byte
 		rawImageData, stderr, err = minikubeSSH(nodes[0], nil,

test/e2e/verification_test.go

@@ -56,6 +56,11 @@ func verificationTestSuite() {
 		// Arrange
 		finbackup := CreateBackup(ctx, ctrlClient, rookNamespace, pvc, nodes[0])
 
+		By("verifying checksum file is created")
+		rawChecksumPath := filepath.Join("/fin", pvc.Namespace, pvc.Name, "raw.img.csum")
+		_, stderr, err := minikubeSSH(nodes[0], nil, "test", "-f", rawChecksumPath)
+		Expect(err).NotTo(HaveOccurred(), "raw.img.csum should exist. stderr: "+string(stderr))
+
 		// Act
 		By("restoring from the backup")
 		finrestore := CreateRestore(ctx, ctrlClient,