From: Kefu Chai <kchai@redhat.com>
Date: Wed, 26 May 2021 02:36:31 +0000 (+0800)
Subject: Merge pull request #41484 from liewegas/cephadm-progress
X-Git-Tag: v17.1.0~1841
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac83f83ad6d2154d5d7014dbd6f4fad087e7c9f4;p=ceph.git

Merge pull request #41484 from liewegas/cephadm-progress

mgr/cephadm: progress item for service apply

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
---

ac83f83ad6d2154d5d7014dbd6f4fad087e7c9f4
diff --cc src/pybind/mgr/cephadm/serve.py
index 652d9c0c0f1e,56cc842b042f..3a2128e49580
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@@ -781,11 -769,13 +805,13 @@@ class CephadmServe
                  daemon_spec = svc.prepare_create(daemon_spec)
                  self._create_daemon(daemon_spec)
                  r = True
+                 progress_done += 1
+                 update_progress()
              except (RuntimeError, OrchestratorError) as e:
 -                self.mgr.events.for_service(
 -                    spec, 'ERROR',
 -                    f"Failed while placing {slot.daemon_type}.{daemon_id} "
 -                    f"on {slot.hostname}: {e}")
 +                msg = (f"Failed while placing {slot.daemon_type}.{daemon_id} "
 +                       f"on {slot.hostname}: {e}")
 +                self.mgr.events.for_service(spec, 'ERROR', msg)
 +                self.mgr.log.error(msg)
                  # only return "no change" if no one else has already succeeded.
                  # later successes will also change to True
                  if r is None: