RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/balancer: mgr/balancer/max_misplaced -> pg_max_misplaced

Browse Source 
Make this a compiled-in option that is consumed by other components as
well as the balancer.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-09-19 14:35:03 -05:00
parent 4fc2af95ce
commit edbd592ee4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/options.cc
View File

@ -4974,6 +4974,10 @@ std::vector<Option> get_global_options() {
Option("debug_asok_assert_abort", Option::TYPE_BOOL, Option::LEVEL_DEV)
.set_default(false)
.set_description("allow commands 'assert' and 'abort' via asok for testing crash dumps etc"),
Option("target_max_misplaced_ratio", Option::TYPE_FLOAT, Option::LEVEL_BASIC)
.set_default(.05)
.set_description("Max ratio of misplaced objects to target when throttling data rebalancing activity"),
});
}

8
src/pybind/mgr/balancer/module.py
View File

@ -17,7 +17,6 @@ from mgr_module import CRUSHMap
# available modes: 'none', 'crush', 'crush-compat', 'upmap', 'osd_weight'
default_mode = 'none'
default_sleep_interval = 60 # seconds
default_max_misplaced = .05 # max ratio of pgs replaced at a time
TIME_FORMAT = '%Y-%m-%d_%H:%M:%S'
@ -208,7 +207,6 @@ class Module(MgrModule):
{'name': 'crush_compat_max_iterations'},
{'name': 'crush_compat_step'},
{'name': 'end_time'},
{'name': 'max_misplaced'},
{'name': 'min_score'},
{'name': 'mode'},
{'name': 'sleep_interval'},
@ -644,8 +642,7 @@ class Module(MgrModule):
def optimize(self, plan):
self.log.info('Optimize plan %s' % plan.name)
plan.mode = self.get_config('mode', default_mode)
max_misplaced = float(self.get_config('max_misplaced',
default_max_misplaced))
max_misplaced = float(self.get_option('target_max_misplaced_ratio'))
self.log.info('Mode %s, max misplaced %f' %
(plan.mode, max_misplaced))
@ -729,8 +726,7 @@ class Module(MgrModule):
step = float(self.get_config('crush_compat_step', .5))
if step <= 0 or step >= 1.0:
return -errno.EINVAL, '"crush_compat_step" must be in (0, 1)'
max_misplaced = float(self.get_config('max_misplaced',
default_max_misplaced))
max_misplaced = float(self.get_option('target_max_misplaced_ratio'))
min_pg_per_osd = 2
ms = plan.initial