Merge pull request ceph#46517 from guits/cephadm-upgrade-status-is_pa…

…used cephadm: add 'is_paused' field in orch status output Reviewed-by: Adam King <[email protected]> Reviewed-by: Michael Fritch <[email protected]>
selroc · Jun 8, 2022 · 0de9173 · 0de9173
2 parents cf2fdca + de1c428
commit 0de9173
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
@@ -147,6 +147,7 @@ def upgrade_status(self) -> orchestrator.UpgradeStatusSpec:
             r.target_image = self.target_image
             r.in_progress = True
             r.progress, r.services_complete = self._get_upgrade_info()
+            r.is_paused = self.upgrade_state.paused
 
             if self.upgrade_state.daemon_types is not None:
                 which_str = f'Upgrading daemons of type(s) {",".join(self.upgrade_state.daemon_types)}'

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
@@ -783,6 +783,7 @@ def __init__(self) -> None:
         self.which: str = '<unknown>'  # for if user specified daemon types, services or hosts
         self.progress: Optional[str] = None  # How many of the daemons have we upgraded
         self.message = ""  # Freeform description
+        self.is_paused: bool = False  # Is the upgrade paused?
 
 
 def handle_type_error(method: FuncT) -> FuncT:

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
@@ -1421,6 +1421,7 @@ def _upgrade_status(self) -> HandleCommandResult:
             'services_complete': status.services_complete,
             'progress': status.progress,
             'message': status.message,
+            'is_paused': status.is_paused,
         }
         out = json.dumps(r, indent=4)
         return HandleCommandResult(stdout=out)