Merge pull request ceph#16093 from tchaikov/wip-20432

osd: clear_queued_recovery() in on_shutdown() Reviewed-by: Josh Durgin <[email protected]>
jkirk · Jul 4, 2017 · a7960ad · a7960ad
2 parents a5471e7 + 6590014
commit a7960ad
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
@@ -10661,6 +10661,11 @@ void PrimaryLogPG::on_shutdown()
   // handles queue races
   deleting = true;
 
+  if (recovery_queued) {
+    recovery_queued = false;
+    osd->clear_queued_recovery(this);
+  }
+
   clear_scrub_reserved();
   scrub_clear_state();