From: John Spray Date: Wed, 11 May 2016 14:08:12 +0000 (-0500) Subject: Merge pull request #8771 from xiaoxichen/configurable_prefix X-Git-Tag: v11.0.0~583 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a570d711017acca0cf3a191a52729c0b37bbb05;p=ceph.git Merge pull request #8771 from xiaoxichen/configurable_prefix pybind: configurable cephfs_vol_client prefix. Reviewed-by: John Spray --- 3a570d711017acca0cf3a191a52729c0b37bbb05 diff --cc src/pybind/ceph_volume_client.py index f2f1b831f57,4b85f1ac414..656dce5d3d4 --- a/src/pybind/ceph_volume_client.py +++ b/src/pybind/ceph_volume_client.py @@@ -214,12 -214,13 +214,14 @@@ class CephFSVolumeClient(object) self.conf_path = conf_path self.cluster_name = cluster_name self.auth_id = auth_id + self.volume_prefix = volume_prefix if volume_prefix else self.DEFAULT_VOL_PREFIX + self.pool_ns_prefix = pool_ns_prefix if pool_ns_prefix else self.DEFAULT_NS_PREFIX - def evict(self, auth_id, timeout=30): + def evict(self, auth_id, timeout=30, volume_path=None): """ - Evict all clients using this authorization ID. Assumes that the - authorisation key has been revoked prior to calling this function. + Evict all clients based on the authorization ID and optionally based on + the volume path mounted. Assumes that the authorization key has been + revoked prior to calling this function. This operation can throw an exception if the mon cluster is unresponsive, or any individual MDS daemon is unresponsive for longer than the timeout passed in.