stop backup slicer after dumpDone

Author: defbin

pbm/backup/backup.go

@@ -622,7 +622,7 @@ func (b *Backup) waitForFirstLastWrite(
 				return first, last, errors.Errorf("backup stuck, last beat ts: %d", bmeta.Hb.T)
 			}
 
-			if bmeta.FirstWriteTS.T > 0 && bmeta.LastWriteTS.T > 0 {
+			if bmeta.FirstWriteTS.T > 1 && bmeta.LastWriteTS.T > 1 {
 				return bmeta.FirstWriteTS, bmeta.LastWriteTS, nil
 			}
 		case <-ctx.Done():
@@ -702,7 +702,7 @@ func setClusterLastWriteImpl(
 			return errors.New("no replset metadata")
 		}
 
-		if condAll(bcp.Replsets, func(br *BackupReplset) bool { return !br.LastWriteTS.IsZero() }) {
+		if condAll(bcp.Replsets, func(br *BackupReplset) bool { return br.LastWriteTS.T > 1 }) {
 			break
 		}
 

pbm/backup/logical.go

@@ -178,6 +178,18 @@ func (b *Backup) doLogical(
 		return errors.Wrap(err, "set shard's StatusDumpDone")
 	}
 
+	if inf.IsLeader() {
+		err := b.reconcileStatus(ctx, bcp.Name, opid.String(), defs.StatusDumpDone, nil)
+		if err != nil {
+			return errors.Wrap(err, "check cluster for dump done")
+		}
+	}
+
+	err = b.waitForStatus(ctx, bcp.Name, defs.StatusDumpDone, nil)
+	if err != nil {
+		return errors.Wrap(err, "waiting for dump done")
+	}
+
 	lastSavedTS, oplogSize, err := stopOplogSlicer()
 	if err != nil {
 		return errors.Wrap(err, "oplog")
@@ -189,22 +201,12 @@ func (b *Backup) doLogical(
 	}
 
 	if inf.IsLeader() {
-		err := b.reconcileStatus(ctx, bcp.Name, opid.String(), defs.StatusDumpDone, nil)
-		if err != nil {
-			return errors.Wrap(err, "check cluster for dump done")
-		}
-
 		err = b.setClusterLastWrite(ctx, bcp.Name)
 		if err != nil {
 			return errors.Wrap(err, "set cluster last write ts")
 		}
 	}
 
-	err = b.waitForStatus(ctx, bcp.Name, defs.StatusDumpDone, nil)
-	if err != nil {
-		return errors.Wrap(err, "waiting for dump done")
-	}
-
 	err = IncBackupSize(ctx, b.leadConn, bcp.Name, snapshotSize+oplogSize)
 	if err != nil {
 		return errors.Wrap(err, "inc backup size")