]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8771 from xiaoxichen/configurable_prefix
authorJohn Spray <jspray@redhat.com>
Wed, 11 May 2016 14:08:12 +0000 (09:08 -0500)
committerJohn Spray <jspray@redhat.com>
Wed, 11 May 2016 14:08:12 +0000 (09:08 -0500)
pybind: configurable cephfs_vol_client prefix.

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/pybind/ceph_volume_client.py

index f2f1b831f579b2fcf2e4c5b07d7fd52fd303ee3b,4b85f1ac4142440eeb863a5974668b765956020d..656dce5d3d4b9d956442a13a9f2669311bd12982
@@@ -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.