Skip to content

Commit 3482ebc

Browse files
mgr/vol: don't define progress bar ID repeatedly
Orignally, when the feature was in development, IDs for clone progress bars were set to randomly generated UUID strings. But, eventually, it was decided to assign fixed strings to them. Unlike UUIDs, these strings stay the same even when progress bars are destroyed and re-created. Therefore, instead of re-assigning the same strings every time initiate_reporting() is called, move them to __init__() so that both the IDs are defined only once. Signed-off-by: Rishabh Dave <[email protected]>
1 parent 327d209 commit 3482ebc

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/pybind/mgr/volumes/fs/stats_util.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,18 @@ def __init__(self, volclient, vol_spec):
106106
# reporting has already been initiated by calling RTimer.is_alive().
107107
self.update_task = RTimer(1, self._update_progress_bars)
108108

109+
# progress event ID for ongoing clone jobs
110+
self.on_pev_id: Optional[str] = 'mgr-vol-ongoing-clones'
111+
# progress event ID for ongoing+pending clone jobs
112+
self.onpen_pev_id: Optional[str] = 'mgr-vol-total-clones'
113+
109114
def initiate_reporting(self):
110115
if self.update_task.is_alive():
111116
log.info('progress reporting thread is already alive, not '
112117
'initiating it again')
113118
return
114119

115120
log.info('initiating progress reporting for clones...')
116-
# progress event ID for ongoing clone jobs
117-
self.on_pev_id: Optional[str] = 'mgr-vol-ongoing-clones'
118-
# progress event ID for ongoing+pending clone jobs
119-
self.onpen_pev_id: Optional[str] = 'mgr-vol-total-clones'
120-
121121
self.update_task = RTimer(1, self._update_progress_bars)
122122
self.update_task.start()
123123
log.info('progress reporting for clones has been initiated')
@@ -294,10 +294,7 @@ def _finish_progress_events(self):
294294
assert self.onpen_pev_id is not None
295295

296296
self.volclient.mgr.remote('progress', 'complete', self.on_pev_id)
297-
self.on_pev_id = None
298-
299297
self.volclient.mgr.remote('progress', 'complete', self.onpen_pev_id)
300-
self.onpen_pev_id = None
301298

302299
log.info('finished removing progress bars from "ceph status" output')
303300

0 commit comments

Comments
 (0)