From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Thu, 2 Apr 2015 03:49:10 +0000 (+0800)
Subject: Scrub: when delete pg, call clear_scrub_reserved().
X-Git-Tag: v9.0.1~164^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b8ec6be1cd2986348374f6612c91a5398bd3f3d;p=ceph.git

Scrub: when delete pg, call clear_scrub_reserved().

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 7f6d713494b0..581bcf612d76 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -8690,7 +8690,6 @@ void ReplicatedPG::on_shutdown()
 
   // remove from queues
   osd->recovery_wq.dequeue(this);
-  osd->scrub_wq.dequeue(this);
   osd->snap_trim_wq.dequeue(this);
   osd->pg_stat_queue_dequeue(this);
   osd->dequeue_pg(this, 0);
@@ -8699,6 +8698,7 @@ void ReplicatedPG::on_shutdown()
   // handles queue races
   deleting = true;
 
+  clear_scrub_reserved();
   unreg_next_scrub();
   cancel_copy_ops(false);
   cancel_flush_ops(false);