Skip to content

Commit f7d237e

Browse files
authored
K8SPSMDB-981: Upgrade PBM to v2.3.0 (#1325)
1 parent 1127c61 commit f7d237e

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/go-openapi/validate v0.22.1
1515
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
1616
github.com/hashicorp/go-version v1.6.0
17-
github.com/percona/percona-backup-mongodb v1.8.1-0.20230725073611-5d2c6eeb81be
17+
github.com/percona/percona-backup-mongodb v1.8.1-0.20230920143330-3b1c2e263901
1818
github.com/pkg/errors v0.9.1
1919
github.com/robfig/cron/v3 v3.0.1
2020
github.com/sirupsen/logrus v1.9.3

go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ github.com/evanphx/json-patch/v5 v5.0.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2Vvl
107107
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
108108
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
109109
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
110-
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
110+
github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
111111
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
112112
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
113113
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
@@ -435,8 +435,8 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr
435435
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
436436
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
437437
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
438-
github.com/percona/percona-backup-mongodb v1.8.1-0.20230725073611-5d2c6eeb81be h1:h9DOQtF2k4TJSn4aAgnsGH6jtvsCedNTuiaidvgMISw=
439-
github.com/percona/percona-backup-mongodb v1.8.1-0.20230725073611-5d2c6eeb81be/go.mod h1:Vmj4S69ydcMSN2li6hOC1iRrK86R1FbIbo3VJhtYfcg=
438+
github.com/percona/percona-backup-mongodb v1.8.1-0.20230920143330-3b1c2e263901 h1:BDgsZRCjEuxl2/z4yWBqB0s8d20shuIDks7/RVdZiLs=
439+
github.com/percona/percona-backup-mongodb v1.8.1-0.20230920143330-3b1c2e263901/go.mod h1:fZRCMpUqkWlLVdRKqqaj001LoVP2eo6F0ZhoMPeXDng=
440440
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
441441
github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
442442
github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=

pkg/controller/perconaservermongodbrestore/logical.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (r *ReconcilePerconaServerMongoDBRestore) reconcileLogicalRestore(ctx conte
106106
return status, nil
107107
}
108108

109-
log.Info("Starting restore")
109+
log.Info("Starting restore", "backup", backupName)
110110
status.PBMname, err = runRestore(ctx, backupName, pbmc, cr.Spec.PITR)
111111
status.State = psmdbv1.RestoreStateRequested
112112
return status, err
@@ -188,8 +188,9 @@ func runRestore(ctx context.Context, backup string, pbmc backup.PBM, pitr *psmdb
188188
cmd = pbm.Cmd{
189189
Cmd: pbm.CmdRestore,
190190
Restore: &pbm.RestoreCmd{
191-
Name: rName,
192-
OplogTS: primitive.Timestamp{T: uint32(ts)},
191+
Name: rName,
192+
BackupName: backup,
193+
OplogTS: primitive.Timestamp{T: uint32(ts)},
193194
},
194195
}
195196
case pitr.Type == psmdbv1.PITRestoreTypeLatest:
@@ -201,8 +202,9 @@ func runRestore(ctx context.Context, backup string, pbmc backup.PBM, pitr *psmdb
201202
cmd = pbm.Cmd{
202203
Cmd: pbm.CmdRestore,
203204
Restore: &pbm.RestoreCmd{
204-
Name: rName,
205-
OplogTS: primitive.Timestamp{T: tl.End},
205+
Name: rName,
206+
BackupName: backup,
207+
OplogTS: primitive.Timestamp{T: tl.End},
206208
},
207209
}
208210
}

0 commit comments

Comments
 (0)