From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Jan 2020 22:37:51 +0000 (-0600)
Subject: mgr/cephadm: base upgrade check on return code, not stderr
X-Git-Tag: v15.1.0~92^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7244b7cef18152e5bac2176ff8f94828eca6fbf2;p=ceph.git

mgr/cephadm: base upgrade check on return code, not stderr

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index cccb7756cddc..d64701b71bda 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -395,7 +395,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
             })
             if not self.upgrade_state or self.upgrade_state.get('paused'):
                 return False
-            if err:
+            if ret:
                 self.log.info('Upgrade: not safe to stop %s.%s' %
                               (s.service_type, s.service_instance))
                 time.sleep(15)