From: xie xingguo Date: Tue, 18 Sep 2018 08:37:56 +0000 (+0800) Subject: osd/OSD: clean up the pg-merge code a bit X-Git-Tag: v14.1.0~548^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d9642c3fcdeb4a9a976fe0d28179b1376f8b8df;p=ceph.git osd/OSD: clean up the pg-merge code a bit Note that the __cur__ spg_t should already be included in the children set and hence we could safely move that insertion. Signed-off-by: xie xingguo --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 92cec5482c9a..ea7e693403a6 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -399,7 +399,6 @@ void OSDService::identify_splits_and_merges( << " pg_num " << pgnum << " -> " << q->second << " is merge source, target " << parent << ", source(s) " << children << dendl; - merge_pgs->insert(make_pair(cur, q->first)); merge_pgs->insert(make_pair(parent, q->first)); for (auto c : children) { merge_pgs->insert(make_pair(c, q->first)); @@ -10193,11 +10192,11 @@ void OSDShard::prime_merges(const OSDMapRef& as_of_osdmap, slot = r.first->second.get(); if (slot->pg) { // already have pg - dout(20) << __func__ << " have merge target pg " << pgid + dout(20) << __func__ << " have merge participant pg " << pgid << " " << slot->pg << dendl; } else if (!slot->waiting_for_split.empty() && *slot->waiting_for_split.begin() < epoch) { - dout(20) << __func__ << " pending split on merge target pg " << pgid + dout(20) << __func__ << " pending split on merge participant pg " << pgid << " " << slot->waiting_for_split << dendl; } else { dout(20) << __func__ << " creating empty merge participant " << pgid