Skip to content

Commit 8b174f9

Browse files
authored
PBM-1321 - pbm log says "waiting for the oplog" when it's actually waiting for the backup to finish (#1204)
1 parent 28612ab commit 8b174f9

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pbm/backup/logical.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,36 +200,43 @@ func (b *Backup) doLogical(
200200
return errors.Wrap(err, "generate archive meta v1")
201201
}
202202

203-
l.Info("dump finished, waiting for the oplog")
203+
l.Info("dump finished for RS: %s", b.brief.SetName)
204204

205205
err = ChangeRSState(b.leadConn, bcp.Name, rsMeta.Name, defs.StatusDumpDone, "")
206206
if err != nil {
207207
return errors.Wrap(err, "set shard's StatusDumpDone")
208208
}
209209

210210
if inf.IsLeader() {
211+
if b.brief.Sharded {
212+
l.Info("checking status of dump on other nodes")
213+
}
211214
err := b.reconcileStatus(ctx, bcp.Name, opid.String(), defs.StatusDumpDone, nil)
212215
if err != nil {
213216
return errors.Wrap(err, "check cluster for dump done")
214217
}
215218
} else {
219+
l.Info("waiting for leader to validate dump done on all nodes")
216220
err = b.waitForStatus(ctx, bcp.Name, defs.StatusDumpDone, nil)
217221
if err != nil {
218222
return errors.Wrap(err, "waiting for dump done")
219223
}
220224
}
221225

226+
l.Info("stopping oplog slicer on this node")
222227
lastSavedTS, oplogSize, err := stopOplogSlicer()
223228
if err != nil {
224229
return errors.Wrap(err, "oplog")
225230
}
226231

232+
l.Info("setting last write timestamp on this node")
227233
err = SetRSLastWrite(b.leadConn, bcp.Name, rsMeta.Name, lastSavedTS)
228234
if err != nil {
229235
return errors.Wrap(err, "set shard's last write ts")
230236
}
231237

232238
if inf.IsLeader() {
239+
l.Info("setting last common write timestamp across all nodes")
233240
err = b.setClusterLastWrite(ctx, bcp.Name)
234241
if err != nil {
235242
return errors.Wrap(err, "set cluster last write ts")

0 commit comments

Comments
 (0)