[PBM-1248] limit oplog replay for snapshot-only restore

defbin · defbin · commit 444c6d7eeebd · 2024-02-22T23:12:36.000+01:00
diff --git a/cmd/pbm/delete.go b/cmd/pbm/delete.go
@@ -17,7 +17,6 @@ import (
 	"github.com/percona/percona-backup-mongodb/pbm/defs"
 	"github.com/percona/percona-backup-mongodb/pbm/errors"
 	"github.com/percona/percona-backup-mongodb/pbm/oplog"
-	"github.com/percona/percona-backup-mongodb/pbm/util"
 	"github.com/percona/percona-backup-mongodb/sdk"
 )
 
diff --git a/pbm/restore/logical.go b/pbm/restore/logical.go
@@ -160,7 +160,7 @@ func (r *Restore) Snapshot(ctx context.Context, cmd *ctrl.RestoreCmd, opid ctrl.
 		return err
 	}
 
-	oplogOption := &applyOplogOption{nss: nss}
+	oplogOption := &applyOplogOption{end: &bcp.LastWriteTS, nss: nss}
 	if r.nodeInfo.IsConfigSrv() && util.IsSelective(nss) {
 		oplogOption.nss = []string{"config.databases"}
 		oplogOption.filter = newConfigsvrOpFilter(nss)

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ import (`
`17`	`17`	`"github.com/percona/percona-backup-mongodb/pbm/defs"`
`18`	`18`	`"github.com/percona/percona-backup-mongodb/pbm/errors"`
`19`	`19`	`"github.com/percona/percona-backup-mongodb/pbm/oplog"`
`20`		`- "github.com/percona/percona-backup-mongodb/pbm/util"`
`21`	`20`	`"github.com/percona/percona-backup-mongodb/sdk"`
`22`	`21`	`)`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func (r Restore) Snapshot(ctx context.Context, cmd ctrl.RestoreCmd, opid ctrl.`
`160`	`160`	`return err`
`161`	`161`	`}`
`162`	`162`
`163`		`- oplogOption := &applyOplogOption{nss: nss}`
	`163`	`+ oplogOption := &applyOplogOption{end: &bcp.LastWriteTS, nss: nss}`
`164`	`164`	`if r.nodeInfo.IsConfigSrv() && util.IsSelective(nss) {`
`165`	`165`	`oplogOption.nss = []string{"config.databases"}`
`166`	`166`	`oplogOption.filter = newConfigsvrOpFilter(nss)`