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

pybind/mgr/balancer: make 'eval' command can evaluate specific pool

Browse Source 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
xie xingguo 2018-01-30 20:00:33 +08:00
parent 675c3525b8
commit ffc06e696b
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,13 +212,13 @@ class Module(MgrModule):
"perm": "rw",
},
{
"cmd": "balancer eval name=plan,type=CephString,req=false",
"desc": "Evaluate data distribution for the current cluster or specific plan",
"cmd": "balancer eval name=option,type=CephString,req=false",
"desc": "Evaluate data distribution for the current cluster or specific pool or specific plan",
"perm": "r",
},
{
"cmd": "balancer eval-verbose name=plan,type=CephString,req=false",
"desc": "Evaluate data distribution for the current cluster or specific plan (verbosely)",
"cmd": "balancer eval-verbose name=option,type=CephString,req=false",
"desc": "Evaluate data distribution for the current cluster or specific pool or specific plan (verbosely)",
"perm": "r",
},
{
@ -288,13 +288,20 @@ class Module(MgrModule):
elif command['prefix'] == 'balancer eval' or command['prefix'] == 'balancer eval-verbose':
verbose = command['prefix'] == 'balancer eval-verbose'
pools = []
if 'plan' in command:
plan = self.plans.get(command['plan'])
if 'option' in command:
plan = self.plans.get(command['option'])
if not plan:
return (-errno.ENOENT, '', 'plan %s not found' %
command['plan'])
pools = plan.pools
ms = plan.final_state()
# not a plan, does it look like a pool?
osdmap = self.get_osdmap()
valid_pool_names = [p['pool_name'] for p in osdmap.dump().get('pools', [])]
option = command['option']
if option not in valid_pool_names:
return (-errno.EINVAL, '', 'option "%s" not a plan or a pool' % option)
pools.append(option)
ms = MappingState(osdmap, self.get("pg_dump"), 'pool "%s"' % option)
else:
pools = plan.pools
ms = plan.final_state()
else:
ms = MappingState(self.get_osdmap(),
self.get("pg_dump"),