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

Merge pull request #35943 from tchaikov/wip-mgr-balancer

Browse Source 
pybind/mgr/balancer: use "==" and "!=" for comparing str

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Kefu Chai 2020-07-08 20:03:57 +08:00 committed by GitHub
commit d3355c6b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,7 @@ class Module(MgrModule):
return (0, '', '')
elif command['prefix'] == 'balancer pool ls':
pool_ids = self.get_module_option('pool_ids')
if pool_ids is '':
if pool_ids == '':
return (0, '', '')
pool_ids = pool_ids.split(',')
pool_ids = [int(p) for p in pool_ids]
@ -496,7 +496,7 @@ class Module(MgrModule):
to_add = [str(pool_id_by_name[p]) for p in raw_names if p in pool_id_by_name]
existing = self.get_module_option('pool_ids')
final = to_add
if existing is not '':
if existing != '':
existing = existing.split(',')
final = set(to_add) | set(existing)
self.set_module_option('pool_ids', ','.join(final))
@ -504,7 +504,7 @@ class Module(MgrModule):
elif command['prefix'] == 'balancer pool rm':
raw_names = command['pools']
existing = self.get_module_option('pool_ids')
if existing is '': # for idempotence
if existing == '': # for idempotence
return (0, '', '')
existing = existing.split(',')
osdmap = self.get_osdmap()
@ -664,7 +664,7 @@ class Module(MgrModule):
osdmap = self.get_osdmap()
allow = self.get_module_option('pool_ids')
final = []
if allow is not '':
if allow != '':
allow = allow.split(',')
valid = [str(p['pool']) for p in osdmap.dump().get('pools', [])]
final = set(allow) & set(valid)