mgr/DaemonServer: cancel upmap for merge source and target simultaneously

Which is more effective...

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

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index a1d5f87208e6afb2618013ba039205957905ce4e..5283bb4654d103eeee3c436d99eccbae978250c0 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -2332,7 +2332,8 @@ void DaemonServer::adjust_pgs()
                       << " has upmap" << dendl;
              upmaps_to_clear.insert(merge_target);
              ok = false;
-           } else if (osdmap.have_pg_upmaps(merge_source)) {
+           }
+            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()