mgr/DaemonServer: skip adjusting pgp_num when merging is in-progress

otherwise there is a possibility we might change the up set of the
merge participants and hence have to back off the merge process.
Also this will cause some other (racy) corner cases that are hard
to take care of.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 9d09f1b5c0626c592e66498e533429157c54830b..99e4487296575e8d81634da237b4ff6aba335945 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -2512,6 +2512,7 @@ void DaemonServer::adjust_pgs()
                       << " and " << merge_target
                       << ")" << dendl;
              pg_num_to_set[osdmap.get_pool_name(i.first)] = target;
+              continue;
            }
          } else if (p.get_pg_num_target() > p.get_pg_num()) {
            // pg_num increase (split)