ReplicatedPG::cancel_pull: ECBackend might cancel_pull on a non-missing object

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index f04a9176935b79c1931947c626a7c65a1fc0d976..32171c3ba4bbf6ca9e60460f42d8957b7da50883 100644 (file)
--- 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)