Merge pull request ceph#58517 from phlogistonjohn/jjm-cephadm-ranked-by-spec

mgr/cephadm: allow services to be conditionally ranked

Reviewed-by: Adam King <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/module.py

@@ -3321,6 +3321,9 @@ def _plan(self, spec: ServiceSpec) -> dict:
                     'data': self._preview_osdspecs(osdspecs=[cast(DriveGroupSpec, spec)])}
 
         svc = self.cephadm_services[spec.service_type]
+        rank_map = None
+        if svc.ranked(spec):
+            rank_map = self.spec_store[spec.service_name()].rank_map
         ha = HostAssignment(
             spec=spec,
             hosts=self.cache.get_schedulable_hosts(),
@@ -3329,7 +3332,7 @@ def _plan(self, spec: ServiceSpec) -> dict:
             networks=self.cache.networks,
             daemons=self.cache.get_daemons_by_service(spec.service_name()),
             allow_colo=svc.allow_colo(),
-            rank_map=self.spec_store[spec.service_name()].rank_map if svc.ranked() else None
+            rank_map=rank_map
         )
         ha.validate()
         hosts, to_add, to_remove = ha.place()

src/pybind/mgr/cephadm/serve.py

@@ -780,7 +780,7 @@ def has_interface_for_vip(host: str, sspec: ServiceSpec) -> bool:
         }
 
         rank_map = None
-        if svc.ranked():
+        if svc.ranked(spec):
             rank_map = self.mgr.spec_store[spec.service_name()].rank_map or {}
         ha = HostAssignment(
             spec=spec,

src/pybind/mgr/cephadm/services/cephadmservice.py

@@ -288,7 +288,7 @@ def per_host_daemon_type(self, spec: Optional[ServiceSpec] = None) -> Optional[s
         """
         return None
 
-    def ranked(self) -> bool:
+    def ranked(self, spec: ServiceSpec) -> bool:
         """
         If True, we will assign a stable rank (0, 1, ...) and monotonically increasing
         generation (0, 1, ...) to each daemon we create/deploy.

src/pybind/mgr/cephadm/services/nfs.py

@@ -23,7 +23,7 @@
 class NFSService(CephService):
     TYPE = 'nfs'
 
-    def ranked(self) -> bool:
+    def ranked(self, spec: ServiceSpec) -> bool:
         return True
 
     def fence(self, daemon_id: str) -> None: