Skip to content

Commit

Permalink
Merge pull request #41311 from k0ste/wip-50778-octopus
Browse files Browse the repository at this point in the history
octopus: mgr/progress: ensure progress stays between [0,1]

Reviewed-by: Neha Ojha <nojha@redhat.com>
  • Loading branch information
yuriw committed May 21, 2021
2 parents 77edcfd + 72c6605 commit 7df6b93
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/pybind/mgr/progress/module.py
Expand Up @@ -325,8 +325,14 @@ def pg_update(self, raw_pg_stats, pg_ready, log):

self._pgs = list(set(self._pgs) ^ complete)
completed_pgs = self._original_pg_count - len(self._pgs)
self._progress = (completed_pgs + complete_accumulate)\
/ self._original_pg_count
completed_pgs = max(completed_pgs, 0)
try:
prog = (completed_pgs + complete_accumulate)\
/ self._original_pg_count
except ZeroDivisionError:
prog = 0.0

self._progress = min(max(prog, 0.0), 1.0)

self._refresh()
log.info("Updated progress to %s", self.summary())
Expand Down

0 comments on commit 7df6b93

Please sign in to comment.