From: Sage Weil <sage@redhat.com>
Date: Mon, 28 Oct 2019 18:43:47 +0000 (-0500)
Subject: mgr/ssh: unique names for mds instances
X-Git-Tag: v15.1.0~1123^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bfb501dab9b6068c2ada7ebaea3d87865c75f02;p=ceph.git

mgr/ssh: unique names for mds instances

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

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 27ffa91d1dc3..66e30bcfc0f7 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -841,15 +841,20 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
     def add_mds(self, spec):
         if len(spec.placement.nodes) < spec.count:
             raise RuntimeError("must specify at least %d hosts" % spec.count)
-        n=0
+        daemons = self._get_services('mds')
         results = []
         for host in spec.placement.nodes:
-            mds_id = spec.name + '-%d' % n
+            mds_id = self.get_unique_name(daemons, spec.name)
             self.log.debug('placing mds.%s on host %s' % (mds_id, host))
             results.append(
                 self._worker_pool.apply_async(self._create_mds, (mds_id, host))
             )
-            n += 1
+            # add to daemon list so next name(s) will also be unique
+            sd = orchestrator.ServiceDescription()
+            sd.service_instance = mds_id
+            sd.service_type = 'mds'
+            sd.nodename = host
+            daemons.append(sd)
         return SSHWriteCompletion(results)
 
     def _create_mds(self, mds_id, host):