From 4518c4052525624da7a4a2657fa5fc8c19a8819a Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 19 Dec 2018 15:26:02 +0800 Subject: [PATCH] mgr/DaemonServer: merge pg upmap check into status check too Signed-off-by: xie xingguo --- src/mgr/DaemonServer.cc | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 08c5ef9751fc..d4e5f8021143 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -2324,25 +2324,6 @@ void DaemonServer::adjust_pgs() pg_t merge_target = merge_source.get_parent(); bool ok = true; - if (osdmap.have_pg_upmaps(merge_target)) { - dout(10) << "pool " << i.first - << " pg_num_target " << p.get_pg_num_target() - << " pg_num " << p.get_pg_num() - << " - merge target " << merge_target - << " has upmap" << dendl; - upmaps_to_clear.insert(merge_target); - ok = false; - } - if (osdmap.have_pg_upmaps(merge_source)) { - dout(10) << "pool " << i.first - << " pg_num_target " << p.get_pg_num_target() - << " pg_num " << p.get_pg_num() - << " - merge source " << merge_source - << " has upmap" << dendl; - upmaps_to_clear.insert(merge_source); - ok = false; - } - if (p.get_pg_num() != p.get_pg_num_pending()) { dout(10) << "pool " << i.first << " pg_num_target " << p.get_pg_num_target() @@ -2361,6 +2342,16 @@ void DaemonServer::adjust_pgs() } for (auto &merge_participant : {merge_source, merge_target}) { bool is_merge_source = merge_participant == merge_source; + if (osdmap.have_pg_upmaps(merge_participant)) { + dout(10) << "pool " << i.first + << " pg_num_target " << p.get_pg_num_target() + << " pg_num " << p.get_pg_num() + << (is_merge_source ? " - merge source " : " - merge target ") + << merge_participant + << " has upmap" << dendl; + upmaps_to_clear.insert(merge_participant); + ok = false; + } auto q = pg_map.pg_stat.find(merge_participant); if (q == pg_map.pg_stat.end()) { dout(10) << "pool " << i.first -- 2.47.3