Revert "fix external restore"

defbin · defbin · commit e189b5b78254 · 2024-06-13T18:32:53.000+02:00
This reverts commit 7a53d06.
diff --git a/cmd/pbm-agent/restore.go b/cmd/pbm-agent/restore.go
@@ -397,7 +397,6 @@ func (a *Agent) Restore(ctx context.Context, r *ctrl.RestoreCmd, opid ctrl.OPID,
 			return
 		}
 		bcpType = bcp.Type
-		r.BackupName = bcp.Name
 	}
 
 	l.Info("recovery started")
@@ -430,6 +429,7 @@ func (a *Agent) Restore(ctx context.Context, r *ctrl.RestoreCmd, opid ctrl.OPID,
 			return
 		}
 
+		r.BackupName = bcp.Name
 		err = rstr.Snapshot(ctx, r, r.OplogTS, opid, l, a.closeCMD, a.HbPause)
 	}
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,6 @@ func (a Agent) Restore(ctx context.Context, r ctrl.RestoreCmd, opid ctrl.OPID,`
`397`	`397`	`return`
`398`	`398`	`}`
`399`	`399`	`bcpType = bcp.Type`
`400`		`- r.BackupName = bcp.Name`
`401`	`400`	`}`
`402`	`401`
`403`	`402`	`l.Info("recovery started")`
`@@ -430,6 +429,7 @@ func (a Agent) Restore(ctx context.Context, r ctrl.RestoreCmd, opid ctrl.OPID,`
`430`	`429`	`return`
`431`	`430`	`}`
`432`	`431`
	`432`	`+ r.BackupName = bcp.Name`
`433`	`433`	`err = rstr.Snapshot(ctx, r, r.OplogTS, opid, l, a.closeCMD, a.HbPause)`
`434`	`434`	`}`
`435`	`435`	`if err != nil {`