From 8593ad76fc94a72b6c4dfef53a6f57c77e35c0bb Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 20 Feb 2014 18:32:08 -0800 Subject: [PATCH] ReplicatedPG::cancel_pull: ECBackend might cancel_pull on a non-missing object Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index f04a9176935b7..32171c3ba4bbf 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -9018,7 +9018,8 @@ void ReplicatedPG::cancel_pull(const hobject_t &soid) assert(recovering.count(soid)); recovering.erase(soid); finish_recovery_op(soid); - pg_log.set_last_requested(0); // get recover_primary to start over + if (is_missing_object(soid)) + pg_log.set_last_requested(0); // get recover_primary to start over } void ReplicatedPG::check_recovery_sources(const OSDMapRef osdmap) -- 2.39.5