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

defbin · defbin · commit 4e467842b7e5 · 2024-09-18T10:29:36.000+02:00
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",

Original file line number	Diff line number	Diff line change
`@@ -191,12 +191,12 @@ func checkArtefacts(conf string, shouldStay map[string]struct{}) {`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`-func (c *Cluster) BackupNotDeleteRunning() {`
	`194`	`+func (c *Cluster) CannotRunDeleteDuringBackup() {`
`195`	`195`	`bcpName := c.LogicalBackup()`
`196`	`196`	`c.printBcpList()`
`197`	`197`	`log.Println("deleting backup", bcpName)`
`198`	`198`	`o, err := c.pbm.RunCmd("pbm", "delete-backup", "-y", bcpName)`
`199`		`- if err == nil \|\| !strings.Contains(err.Error(), "backup is in progress") {`
	`199`	`+ if err == nil \|\| !strings.Contains(err.Error(), "another operation in progress, Snapshot backup") {`
`200`	`200`	`list, lerr := c.pbm.RunCmd("pbm", "list")`
`201`	`201`	`log.Fatalf("ERROR: running backup '%s' shouldn't be deleted.\n"+`
`202`	`202`	`"Output: %s\nStderr:%v\nBackups list:\n%v\n%v",`