From cc707155ea475836f97791c08c31994fb40e4374 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 22 Oct 2017 22:43:18 -0500 Subject: [PATCH] osd/PG: move local_reserver recovery cancel to Recovering state transition This is easier to follow than canceling the reservation in the next state. Signed-off-by: Sage Weil (cherry picked from commit dde007749bb960122f399b4cb8608a8c1ea4eb9c) --- src/osd/PG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 2ee82d7be40..af86a5a7d81 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -6974,6 +6974,7 @@ PG::RecoveryState::Recovering::react(const AllReplicasRecovered &evt) pg->state_clear(PG_STATE_RECOVERING); pg->state_clear(PG_STATE_FORCED_RECOVERY); release_reservations(); + pg->osd->local_reserver.cancel_reservation(pg->info.pgid); return transit(); } @@ -7017,7 +7018,6 @@ PG::RecoveryState::Recovered::Recovered(my_context ctx) context< RecoveryMachine >().log_enter(state_name); PG *pg = context< RecoveryMachine >().pg; - pg->osd->local_reserver.cancel_reservation(pg->info.pgid); assert(!pg->needs_recovery()); -- 2.47.3