From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 10 Sep 2018 08:52:05 +0000 (+0800)
Subject: mgr/DaemonServer: split should respect inflight creating pgs
X-Git-Tag: v14.0.1~342^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b10ed10351b2e8c23d2e85f1f79684eeb63ba60;p=ceph.git

mgr/DaemonServer: split should respect inflight creating pgs

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

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 4bea42f02c3f..00f480a239c4 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 {