update with ccrs

Author: veceraj

cmd/pbm/main.go

@@ -889,7 +889,7 @@ func (app *pbmApp) buildReplayCmd() *cobra.Command {
 		Use:   "oplog-replay",
 		Short: "Replay oplog",
 		RunE: app.wrapRunE(func(cmd *cobra.Command, args []string) (fmt.Stringer, error) {
-			return replayOplog(app.ctx, app.conn, app.pbm, replayOpts, app.node, app.pbmOutF)
+			return replayOplog(app.ctx, app.conn, app.ccrsConn, app.pbm, replayOpts, app.node, app.pbmOutF)
 		}),
 	}
 

cmd/pbm/oplog.go

@@ -44,6 +44,7 @@ func (r oplogReplayResult) String() string {
 func replayOplog(
 	ctx context.Context,
 	conn connect.Client,
+	ccrsConn connect.Client,
 	pbm *sdk.Client,
 	o replayOptions,
 	node string,
@@ -106,7 +107,7 @@ func replayOplog(
 	}
 
 	fmt.Print("Started.\nWaiting to finish")
-	err = waitRestore(ctx, conn, m, node, defs.StatusDone, 0)
+	err = waitRestore(ctx, conn, ccrsConn, m, node, defs.StatusDone, 0)
 	if err != nil {
 		if errors.Is(err, context.DeadlineExceeded) {
 			err = errWaitTimeout

cmd/pbm/restore.go

@@ -183,7 +183,7 @@ func runRestore(
 		return nil, err
 	}
 	if o.extern && outf == outText {
-		err = waitRestore(ctx, conn, m, node, defs.StatusCopyReady, tdiff)
+		err = waitRestore(ctx, conn, ccrsConn, m, node, defs.StatusCopyReady, tdiff)
 		if err != nil {
 			return nil, errors.Wrap(err, "waiting for the `copyReady` status")
 		}
@@ -209,7 +209,7 @@ func runRestore(
 		typ = " physical restore.\nWaiting to finish"
 	}
 	fmt.Printf("Started%s", typ)
-	err = waitRestore(ctx, conn, m, node, defs.StatusDone, tdiff)
+	err = waitRestore(ctx, conn, ccrsConn, m, node, defs.StatusDone, tdiff)
 	if err == nil {
 		return restoreRet{
 			Name:     m.Name,
@@ -235,12 +235,13 @@ func runRestore(
 func waitRestore(
 	ctx context.Context,
 	conn connect.Client,
+	ccrsConn connect.Client,
 	m *restore.RestoreMeta,
 	node string,
 	status defs.Status,
 	tskew int64,
 ) error {
-	ep, _ := config.GetEpoch(ctx, conn)
+	ep, _ := config.GetEpoch(ctx, ccrsConn)
 	l := log.FromContext(ctx).
 		NewEvent(string(ctrl.CmdRestore), m.Backup, m.OPID, ep.TS())
 	stg, err := util.GetStorage(ctx, conn, node, l)