mon: make reweight max_change default configurable

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 1c313186e8797eb8c624dde83dcb5709b77996fe..9bb15faa1e5485fe492e875803bb2a2e01193654 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -236,6 +236,7 @@ OPTION(mon_max_log_entries_per_event, OPT_INT, 4096)
 OPTION(mon_reweight_min_pgs_per_osd, OPT_U64, 10)   // min pgs per osd for reweight-by-pg command
 OPTION(mon_reweight_min_bytes_per_osd, OPT_U64, 100*1024*1024)   // min bytes per osd for reweight-by-utilization command
 OPTION(mon_reweight_max_osds, OPT_INT, 4)   // max osds to change per reweight-by-* command
+OPTION(mon_reweight_max_change, OPT_DOUBLE, 0.05)
 OPTION(mon_health_data_update_interval, OPT_FLOAT, 60.0)
 OPTION(mon_health_to_clog, OPT_BOOL, true)
 OPTION(mon_health_to_clog_interval, OPT_INT, 3600)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index cedf19a686b04520c907dfb3f65bbee3676f0ce4..f6ea1fbc6b2bbcc05490661eee9c8fc0960f9709 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6666,7 +6666,7 @@ done:
       }
       pools.insert(pool);
     }
-    double max_change = .05;
+    double max_change = g_conf->mon_reweight_max_change;
     cmd_getval(g_ceph_context, cmdmap, "max_change", max_change);
     if (max_change <= 0.0) {
       ss << "max_change " << max_change << " must be positive";