mgr/balancer: set upmap_max_deviation to 1

Field experience shows that previous value 5 leads to skewed OSD
utilization. Set it to 1 and update the relevant test.

Fixes: https://tracker.ceph.com/issues/65748
Signed-off-by: Joshua Blanch <joshua.blanch@clyso.com>

diff --git a/qa/standalone/mgr/balancer.sh b/qa/standalone/mgr/balancer.sh
index 2d7b2f35dc1067a821d03dbb3373a18620fa37ce..f194deeda204ce056cab56e28481eeccd363bb70 100755 (executable)
--- a/qa/standalone/mgr/balancer.sh
+++ b/qa/standalone/mgr/balancer.sh
@@ -141,7 +141,6 @@ function TEST_balancer2() {
     done
 
     ceph osd set-require-min-compat-client luminous
-    ceph config set mgr mgr/balancer/upmap_max_deviation 1
     ceph balancer mode upmap || return 1
     ceph balancer on || return 1
     ceph config set mgr mgr/balancer/sleep_interval 5

diff --git a/src/pybind/mgr/balancer/module.py b/src/pybind/mgr/balancer/module.py
index c98ce9aec41c23ef8607dd88838f458e21f7e790..db421ef359b6ea64bd1a9c4a6436901769f419fb 100644 (file)
--- a/src/pybind/mgr/balancer/module.py
+++ b/src/pybind/mgr/balancer/module.py
@@ -316,7 +316,7 @@ class Module(MgrModule):
                runtime=True),
         Option(name='upmap_max_deviation',
                type='int',
-               default=5,
+               default=1,
                min=1,
                desc='deviation below which no optimization is attempted',
                long_desc='If the number of PGs are within this count then no optimization is attempted',