RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/dashboard: ganesha: support no namespace

Browse Source 
Signed-off-by: Ricardo Dias <rdias@suse.com>
This commit is contained in:
Ricardo Dias 2019-02-05 16:06:21 +00:00
parent 076ccd5465
commit 721fab343c
No known key found for this signature in database
GPG Key ID: 74390C579BD37B68
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pybind/mgr/dashboard/services/ganesha.py
View File

@ -44,13 +44,15 @@ class Ganesha(object):
cluster = "_default_"
if location.count('/') == 0:
pool, namespace = location, None
pool, namespace = location.split('/', 1)
else:
pool, namespace = location.split('/', 1)
else:
cluster = location[:location.find(':')]
pool_nm = location[location.find(':')+1:]
if pool_nm.count('/') == 0:
pool, namespace = pool_nm, None
pool, namespace = pool_nm.split('/', 1)
else:
pool, namespace = pool_nm.split('/', 1)
if cluster in result:
raise NFSException("Duplicate Ganesha cluster definition in "
@ -780,7 +782,8 @@ class GaneshaConf(object):
def _read_raw_config(self):
with mgr.rados.open_ioctx(self.rados_pool) as ioctx:
ioctx.set_namespace(self.rados_namespace)
if self.rados_namespace:
ioctx.set_namespace(self.rados_namespace)
objs = ioctx.list_objects()
for obj in objs:
if obj.key.startswith("export-"):
@ -806,7 +809,8 @@ class GaneshaConf(object):
def _write_raw_config(self, conf_block, obj):
raw_config = GaneshaConfParser.write_conf(conf_block)
with mgr.rados.open_ioctx(self.rados_pool) as ioctx:
ioctx.set_namespace(self.rados_namespace)
if self.rados_namespace:
ioctx.set_namespace(self.rados_namespace)
ioctx.write_full(obj, raw_config.encode('utf-8'))
logger.debug(
"[NFS] write configuration into rados object %s/%s/%s:\n%s",
@ -936,7 +940,8 @@ class GaneshaConf(object):
def _delete_export(self, export_id):
self._persist_daemon_configuration()
with mgr.rados.open_ioctx(self.rados_pool) as ioctx:
ioctx.set_namespace(self.rados_namespace)
if self.rados_namespace:
ioctx.set_namespace(self.rados_namespace)
ioctx.remove_object("export-{}".format(export_id))
def list_exports(self):
@ -979,6 +984,7 @@ class GaneshaConf(object):
def reload_daemons(self, daemons):
with mgr.rados.open_ioctx(self.rados_pool) as ioctx:
ioctx.set_namespace(self.rados_namespace)
if self.rados_namespace:
ioctx.set_namespace(self.rados_namespace)
for daemon_id in daemons:
ioctx.notify("conf-{}".format(daemon_id))