From 0b8ec6be1cd2986348374f6612c91a5398bd3f3d Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 2 Apr 2015 11:49:10 +0800 Subject: [PATCH] Scrub: when delete pg, call clear_scrub_reserved(). Signed-off-by: Jianpeng Ma --- src/osd/ReplicatedPG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 7f6d713494b..581bcf612d7 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); -- 2.47.3