From f6ecd6990645c6afb5643c53b276a3bea223b01a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Jun 2018 07:15:02 -0500 Subject: [PATCH] osd/PG: clear_ready_to_merge on_shutdown (or final merge source prep) Signed-off-by: Sage Weil --- src/osd/OSD.cc | 1 + src/osd/PrimaryLogPG.cc | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index b2ac08a573fe8..cd54538448b1a 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1673,6 +1673,7 @@ void OSDService::_send_ready_to_merge() void OSDService::clear_ready_to_merge(PG *pg) { Mutex::Locker l(merge_lock); + dout(10) << __func__ << " " << pg->pg_id << dendl; ready_to_merge_source.erase(pg->pg_id.pgid); ready_to_merge_target.erase(pg->pg_id.pgid); } diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index a30f08a9a28a5..7e4bc3d76b133 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -11955,6 +11955,10 @@ void PrimaryLogPG::on_shutdown() clear_primary_state(); cancel_recovery(); + + if (is_primary()) { + osd->clear_ready_to_merge(this); + } } void PrimaryLogPG::on_activate() -- 2.39.5