]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/nfs: Don't crash ceph-mgr if NFS clusters are unavailable. 56876/head
authorPonnuvel Palaniyappan <pponnuvel@gmail.com>
Sat, 2 Mar 2024 19:13:36 +0000 (19:13 +0000)
committerPonnuvel Palaniyappan <pponnuvel@gmail.com>
Sat, 15 Jun 2024 08:42:23 +0000 (09:42 +0100)
Fixes https://tracker.ceph.com/issues/56246.
Fixes https://tracker.ceph.com/issues/59438.

Signed-off-by: Ponnuvel Palaniyappan <pponnuvel@gmail.com>
src/pybind/mgr/nfs/utils.py

index ba3190a9644a0abc55ab331c9b2c35de1eba7fec..269079c1ccfb2fb7484257826848fa339d3dfc26 100644 (file)
@@ -5,6 +5,7 @@ from typing import List, Tuple, TYPE_CHECKING
 
 from object_format import ErrorResponseBase
 import orchestrator
+from orchestrator import NoOrchestrator
 import cephfs
 from mgr_util import CephfsClient, open_filesystem
 
@@ -67,7 +68,11 @@ def available_clusters(mgr: 'Module') -> List[str]:
     return value: ['vstart']
     '''
     # TODO check cephadm cluster list with rados pool conf objects
-    completion = mgr.describe_service(service_type='nfs')
+    try:
+        completion = mgr.describe_service(service_type='nfs')
+    except NoOrchestrator:
+        log.exception("No orchestrator configured")
+        return []
     orchestrator.raise_if_exception(completion)
     assert completion.result is not None
     return [cluster.spec.service_id for cluster in completion.result