From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Mar 2020 18:36:42 +0000 (-0500)
Subject: mgr/cephadm: report size=0 for fabricated ServiceDescription
X-Git-Tag: v15.1.1~37^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1eb392daf593aff5f4fdda99dce59047f03d9f17;p=ceph.git

mgr/cephadm: report size=0 for fabricated ServiceDescription

When we fabricate a ServiceDescription for an orphan daemon, set the
size == 0.

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 74dd2f32d63ba..daadd4bff1e8f 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1717,7 +1717,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     sm[n].size = self._get_spec_size(spec)
                     sm[n].created = self.spec_store.spec_created[dd.service_name()]
                 else:
-                    sm[n].size += 1
+                    sm[n].size = 0
                 if dd.status == 1:
                     sm[n].running += 1
                 if not sm[n].last_refresh or not dd.last_refresh or dd.last_refresh < sm[n].last_refresh:  # type: ignore