From ccc89c34da5cf211ba09bb6c1abb1d591d1503bb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 6 Jul 2020 19:16:00 +0800 Subject: [PATCH] pybind/mgr/balancer: use "==" and "!=" for comparing str we cannot assume that two values with the same value share the same identity in Python. also silences warnings like: balancer/module.py:473: SyntaxWarning: "is" with a literal. Did you mean "=="? if pool_ids is '': Fixes: https://tracker.ceph.com/issues/46406 Signed-off-by: Kefu Chai (cherry picked from commit 65dc464977b4c2ea5ab19b8d9d0904ab31f08b94) --- src/pybind/mgr/balancer/module.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/balancer/module.py b/src/pybind/mgr/balancer/module.py index 8130ab3583937..7cde23ed811f1 100644 --- a/src/pybind/mgr/balancer/module.py +++ b/src/pybind/mgr/balancer/module.py @@ -471,7 +471,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] @@ -497,7 +497,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)) @@ -505,7 +505,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() @@ -665,7 +665,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) -- 2.39.5