PBM-1394: check if delete can be run during backup

percona · Sep 18, 2024 · 4e46784 · 4e46784
1 parent ca68fd7
commit 4e46784
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/e2e-tests/cmd/pbm-test/run.go b/e2e-tests/cmd/pbm-test/run.go
@@ -70,8 +70,8 @@ func run(t *sharded.Cluster, typ testTyp) {
 
 	t.SetBallastData(1e5)
 
-	runTest("Check the Running Backup can't be deleted",
-		t.BackupNotDeleteRunning)
+	runTest("Check the Cannot Run Delete During Backup",
+		t.CannotRunDeleteDuringBackup)
 
 	runTest("Check Backup Cancellation",
 		func() { t.BackupCancellation(storage) })

diff --git a/e2e-tests/docker/pbm-agent/Dockerfile b/e2e-tests/docker/pbm-agent/Dockerfile
diff --git a/e2e-tests/pkg/tests/sharded/test_delete_backup.go b/e2e-tests/pkg/tests/sharded/test_delete_backup.go
@@ -191,12 +191,12 @@ func checkArtefacts(conf string, shouldStay map[string]struct{}) {
 	}
 }
 
-func (c *Cluster) BackupNotDeleteRunning() {
+func (c *Cluster) CannotRunDeleteDuringBackup() {
 	bcpName := c.LogicalBackup()
 	c.printBcpList()
 	log.Println("deleting backup", bcpName)
 	o, err := c.pbm.RunCmd("pbm", "delete-backup", "-y", bcpName)
-	if err == nil || !strings.Contains(err.Error(), "backup is in progress") {
+	if err == nil || !strings.Contains(err.Error(), "another operation in progress, Snapshot backup") {
 		list, lerr := c.pbm.RunCmd("pbm", "list")
 		log.Fatalf("ERROR: running backup '%s' shouldn't be deleted.\n"+
 			"Output: %s\nStderr:%v\nBackups list:\n%v\n%v",