Skip to content

Commit bd6b013

Browse files
authored
Merge pull request ceph#60597 from xxhdx1985126/wip-68806
crimson/osd/replicated_recovery_backend: call on_global_recover() only when all replicas and the primary have been recovered Reviewed-by: Matan Breizman <[email protected]>
2 parents 1d6d750 + 5cf1e93 commit bd6b013

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/crimson/osd/replicated_recovery_backend.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,10 @@ ReplicatedRecoveryBackend::recover_delete(
306306
}
307307
return seastar::make_ready_future<>();
308308
}).then_interruptible([this, soid, &stat_diff] {
309-
pg.get_recovery_handler()->on_global_recover(soid, stat_diff, true);
309+
const auto &missing = pg.get_peering_state().get_pg_log().get_missing();
310+
if (!missing.is_missing(soid)) {
311+
pg.get_recovery_handler()->on_global_recover(soid, stat_diff, true);
312+
}
310313
return seastar::make_ready_future<>();
311314
});
312315
});

0 commit comments

Comments
 (0)