mgr/DaemonServer: allow pgp_num increases to be fast if pool is empty(ish)

If we just created a new pool and it's basically empty, there is no reason
to throttle the pgp_num changes.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c7c2d18da5058ffbe1f71e66a8d4c1dcfd8eacdb)

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 1a248eebf33aa5fb1f452e905891ef060846a466..b733668ccbd0d1c18c2749de0420f569c5f175df 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -2584,7 +2584,12 @@ void DaemonServer::adjust_pgs()
            // max_misplaced, to somewhat limit the magnitude of
            // our potential error here.
            int next;
-           if (aggro) {
+
+           pool_stat_t s = pg_map.get_pg_pool_sum_stat(i.first);
+           if (aggro ||
+               // pool is (virtually) empty; just jump to final pgp_num?
+               (p.get_pgp_num_target() > p.get_pgp_num() &&
+                s.stats.sum.num_objects <= p.get_pgp_num_target())) {
              next = target;
            } else {
              double room =