From 4b10ed10351b2e8c23d2e85f1f79684eeb63ba60 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Mon, 10 Sep 2018 16:52:05 +0800 Subject: [PATCH] mgr/DaemonServer: split should respect inflight creating pgs Signed-off-by: xie xingguo --- src/mgr/DaemonServer.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 4bea42f02c3..00f480a239c 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -2234,8 +2234,11 @@ void DaemonServer::adjust_pgs() if (creating_or_unknown >= max) { return; } + left -= creating_or_unknown; dout(10) << "creating_or_unknown " << creating_or_unknown - << " max_creating " << max << dendl; + << " max_creating " << max + << " left " << left + << dendl; cluster_state.with_osdmap([&](const OSDMap& osdmap) { if (pg_map.last_osdmap_epoch != osdmap.get_epoch()) { // do nothing if maps aren't in sync @@ -2331,6 +2334,7 @@ void DaemonServer::adjust_pgs() << " pgs in " << pg_state_string(j.first) << dendl; active = false; + break; } } } else { -- 2.39.5