mgr/progress: ensure progress stays between [0,1]

If _original_pg_count is 0 then progress can be negative.

Fixes: https://tracker.ceph.com/issues/50591
Related-to: https://tracker.ceph.com/issues/50587
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 20990a94598d0249745e2ec25c9197d842119d92)

diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py
index f880bb6ef2d2f07594a7b99e8a58d0840e73097e..5225021c5ebcb072ba4d80cec54b96237fc47fad 100644 (file)
--- a/src/pybind/mgr/progress/module.py
+++ b/src/pybind/mgr/progress/module.py
@@ -265,10 +265,16 @@ class PgRecoveryEvent(Event):
 
         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
-        self._refresh()
+        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 {0} ({1})".format(
             self._progress, self._message
         ))