Skip to content

Commit 39b262f

Browse files
committed
cephfs-top: Removes unused global statements
Recent flake8 runs were failing with: ``` py3: flake8==7.2.0,mccabe==0.7.0,pip==25.0.1,pycodestyle==2.13.0,pyflakes==3.3.0,setuptools==75.8.0,wheel==0.45.1 py3: commands[0] /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/cephfs/top> flake8 --ignore=W503 --max-line-length=100 cephfs-top cephfs-top:344:9: F824 `global fs_list` is unused: name is never assigned in scope cephfs-top:466:13: F824 `global current_states` is unused: name is never assigned in scope cephfs-top:872:9: F824 `global metrics_dict` is unused: name is never assigned in scope cephfs-top:872:9: F824 `global current_states` is unused: name is never assigned in scope cephfs-top:911:9: F824 `global fs_list` is unused: name is never assigned in scope cephfs-top:981:9: F824 `global current_states` is unused: name is never assigned in scope cephfs-top:1126:13: F824 `global current_states` is unused: name is never assigned in scope py3: exit 1 (0.77 seconds) /home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/cephfs/top> flake8 --ignore=W503 --max-line-length=100 cephfs-top pid=2309605 py3: FAIL code 1 (8.15=setup[7.38]+cmd[0.77] seconds) evaluation failed :( (8.24 seconds) ``` Since these variables are only being referenced and not assigned within their scopes, the `global` declarations are unnecessary and can be safely removed. This change: - Removes all flagged `global` statements - Fixes the failing flake8 checks in the CI pipeline - Maintains the original code behavior as variable references still work without the `global` keyword The `global` keyword is only needed when assigning to global variables within a function scope, not when simply referencing them. Signed-off-by: Kefu Chai <[email protected]>
1 parent bcc275f commit 39b262f

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/tools/cephfs/top/cephfs-top

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ class FSTop(FSTopBase):
341341
except Exception as e:
342342
raise FSTopException(f'Error in fs ls: {e}')
343343
fs_map = json.loads(buf.decode('utf-8'))
344-
global fs_list
345344
fs_list.clear()
346345
for filesystem in fs_map:
347346
fs = filesystem['name']
@@ -463,7 +462,7 @@ class FSTop(FSTopBase):
463462
key = 0
464463
endwhile = False
465464
while not endwhile:
466-
global current_states, fs_list
465+
global fs_list
467466
fs_list = self.get_fs_names()
468467

469468
if key == curses.KEY_UP and curr_row1 > 0:
@@ -869,7 +868,6 @@ class FSTop(FSTopBase):
869868
xp += len(self.items(item)) + ITEMS_PAD_LEN
870869

871870
def create_clients(self, stats_json, fs_name):
872-
global metrics_dict, current_states
873871
counters = [m.upper() for m in stats_json[GLOBAL_COUNTERS_KEY]]
874872
self.tablehead_y += 2
875873
res = stats_json[GLOBAL_METRICS_KEY].get(fs_name, {})
@@ -908,7 +906,6 @@ class FSTop(FSTopBase):
908906
if not stats_json['version'] == FS_TOP_SUPPORTED_VER:
909907
self.header.addstr(0, 0, 'perf stats version mismatch!', curses.A_BOLD)
910908
return False
911-
global fs_list
912909
for fs_name in fs_list:
913910
client_metadata = stats_json[CLIENT_METADATA_KEY].get(fs_name, {})
914911
client_cnt = len(client_metadata)
@@ -978,7 +975,7 @@ class FSTop(FSTopBase):
978975

979976
curses.halfdelay(1)
980977
cmd = self.stdscr.getch()
981-
global fs_list, current_states
978+
global fs_list
982979
while not self.exit_ev.is_set():
983980
fs_list = self.get_fs_names()
984981
fs = current_states["last_fs"]
@@ -1123,7 +1120,7 @@ class FSTop(FSTopBase):
11231120
self.exit_ev.set()
11241121

11251122
# header display
1126-
global fs_list, current_states
1123+
global fs_list
11271124
fs_list = self.get_fs_names()
11281125
current_states["last_fs"] = fs_list
11291126
stats_json = self.perf_stats_query()

0 commit comments

Comments
 (0)