From e6113c172523906ee2f5a317ddb358e215d0a448 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 29 Apr 2019 16:17:01 -0500 Subject: [PATCH] mgr: fix pgp_num vs merge pacer This condition should only kick in for pgp_num reductions, or else we'll end up jump to the end instead of slowing down merges. (For splits, we don't need to pace like this at all.) Fixes 76503a1438fa1f166d2c230c73ca8d7b67e6468d Signed-off-by: Sage Weil --- src/mgr/DaemonServer.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 046a76158bd..bd3e1c624fe 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -2575,7 +2575,8 @@ void DaemonServer::adjust_pgs() } dout(20) << " room " << room << " estmax " << estmax << " delta " << delta << " next " << next << dendl; - if (p.get_pgp_num_target() == p.get_pg_num_target()) { + if (p.get_pgp_num_target() == p.get_pg_num_target() && + p.get_pgp_num_target() < p.get_pg_num()) { // since pgp_num is tracking pg_num, ceph is handling // pgp_num. so, be responsible: don't let pgp_num get // too far out ahead of merges (if we are merging). -- 2.39.5