RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 16:25:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20788 from xiexingguo/wip-balancer-04

Browse Source 
pybind/mgr/balancer: two more fixes

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Kefu Chai 2018-03-10 01:53:26 +08:00 committed by GitHub
commit 8426e1b6dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,6 +143,15 @@ class Eval:
num = max(len(target), 1)
r = {}
for t in ('pgs', 'objects', 'bytes'):
if total[t] == 0:
r[t] = {
'avg': 0,
'stddev': 0,
'sum_weight': 0,
'score': 0,
}
continue
avg = float(total[t]) / float(num)
dev = 0.0
@ -426,7 +435,7 @@ class Module(MgrModule):
self.log.debug('pool_rule %s' % pool_rule)
osd_weight = { a['osd']: a['weight']
for a in ms.osdmap_dump.get('osds',[]) }
for a in ms.osdmap_dump.get('osds',[]) if a['weight'] > 0 }
# get expected distributions by root
actual_by_root = {}
@ -450,10 +459,11 @@ class Module(MgrModule):
roots.append(root)
weight_map = ms.crush.get_take_weight_osd_map(rootid)
adjusted_map = {
osd: cw * osd_weight.get(osd, 1.0)
for osd,cw in weight_map.iteritems()
osd: cw * osd_weight[osd]
for osd,cw in weight_map.iteritems() if osd in osd_weight and cw > 0
}
sum_w = sum(adjusted_map.values()) or 1.0
sum_w = sum(adjusted_map.values())
assert sum_w > 0
pe.target_by_root[root] = { osd: w / sum_w
for osd,w in adjusted_map.iteritems() }
actual_by_root[root] = {
@ -545,7 +555,7 @@ class Module(MgrModule):
'objects': objects,
'bytes': bytes,
}
for root, m in pe.total_by_root.iteritems():
for root in pe.total_by_root.iterkeys():
pe.count_by_root[root] = {
'pgs': {
k: float(v)