From: Michael Fritch <mfritch@suse.com>
Date: Thu, 6 Aug 2020 21:39:05 +0000 (-0600)
Subject: mgr/cephadm: check existance of the RADOS pool
X-Git-Tag: v15.2.5~26^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3893e05b3afb19ab22ee200c1581e50da35937a3;p=ceph.git

mgr/cephadm: check existance of the RADOS pool

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4419c18f9fb961b54715c355194b85e57804adec)
---

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index d00c7c2cf18f..6824053ff20b 100644
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -122,6 +122,8 @@ class NFSGanesha(object):
                  daemon_id: str,
                  spec: NFSServiceSpec) -> None:
         assert spec.service_id and daemon_id.startswith(spec.service_id)
+        mgr._check_pool_exists(spec.pool, spec.service_name())
+
         self.mgr = mgr
         self.daemon_id = daemon_id
         self.spec = spec
@@ -173,12 +175,11 @@ class NFSGanesha(object):
                 % (entity, ret, err))
 
     def create_rados_config_obj(self, clobber: Optional[bool] = False) -> None:
-        obj = self.spec.rados_config_name()
-
         with self.mgr.rados.open_ioctx(self.spec.pool) as ioctx:
             if self.spec.namespace:
                 ioctx.set_namespace(self.spec.namespace)
 
+            obj = self.spec.rados_config_name()
             exists = True
             try:
                 ioctx.stat(obj)