RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph_volume_client: remove use of obsolete mds cmd

Browse Source 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2017-10-01 17:08:23 -07:00
parent 71e410c290
commit cbbdd0da7d
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pybind/ceph_volume_client.py
View File

@ -137,7 +137,7 @@ class RankEvicter(threading.Thread):
time.sleep(self.POLL_PERIOD)
self._ready_waited += self.POLL_PERIOD
self._mds_map = self._volume_client._rados_command("mds dump", {})
self._mds_map = self._volume_client.get_mds_map()
def _evict(self):
"""
@ -169,7 +169,7 @@ class RankEvicter(threading.Thread):
return True
elif ret == errno.ETIMEDOUT:
# Oh no, the MDS went laggy (that's how libcephfs knows to emit this error)
self._mds_map = self._volume_client._rados_command("mds dump", {})
self._mds_map = self._volume_client.get_mds_map()
try:
self._wait_for_ready()
except self.GidGone:
@ -370,6 +370,9 @@ class CephFSVolumeClient(object):
auth_meta['dirty'] = False
self._auth_metadata_set(auth_id, auth_meta)
def get_mds_map(self):
fs_map = self._rados_command("fs dump", {})
return fs_map['filesystems'][0]
def evict(self, auth_id, timeout=30, volume_path=None):
"""
@ -388,8 +391,7 @@ class CephFSVolumeClient(object):
log.info("evict clients with {0}".format(', '.join(client_spec)))
mds_map = self._rados_command("mds dump", {})
mds_map = get_mds_map()
up = {}
for name, gid in mds_map['up'].items():
# Quirk of the MDSMap JSON dump: keys in the up dict are like "mds_0"
@ -623,9 +625,9 @@ class CephFSVolumeClient(object):
pool_name = "{0}{1}".format(self.POOL_PREFIX, volume_path.volume_id)
log.info("create_volume: {0}, create pool {1} as data_isolated =True.".format(volume_path, pool_name))
pool_id = self._create_volume_pool(pool_name)
mds_map = self._rados_command("mds dump", {})
mds_map = self.get_mds_map()
if pool_id not in mds_map['data_pools']:
self._rados_command("mds add_data_pool", {
self._rados_command("fs {} add_data_pool".format(mds_map['fs_name']), {
'pool': pool_name
})
self.fs.setxattr(path, 'ceph.dir.layout.pool', pool_name, 0)
@ -723,9 +725,9 @@ class CephFSVolumeClient(object):
pool_name = "{0}{1}".format(self.POOL_PREFIX, volume_path.volume_id)
osd_map = self._rados_command("osd dump", {})
pool_id = self._get_pool_id(osd_map, pool_name)
mds_map = self._rados_command("mds dump", {})
mds_map = self.get_mds_map()
if pool_id in mds_map['data_pools']:
self._rados_command("mds remove_data_pool", {
self._rados_command("fs {} remove_data_pool".format(mds_map['fs_name']), {
'pool': pool_name
})
self._rados_command("osd pool delete",