diff options
Diffstat (limited to 'ufo/gluster/swift/common/DiskDir.py')
| -rw-r--r-- | ufo/gluster/swift/common/DiskDir.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ufo/gluster/swift/common/DiskDir.py b/ufo/gluster/swift/common/DiskDir.py index 8602fabae83..1e6a552b818 100644 --- a/ufo/gluster/swift/common/DiskDir.py +++ b/ufo/gluster/swift/common/DiskDir.py @@ -142,6 +142,7 @@ class DiskDir(DiskCommon): Manage object files on disk. :param path: path to devices on the node + :param drive: gluster volume drive name :param account: account name for the object :param container: container name for the object :param logger: account or container server logging object @@ -149,7 +150,7 @@ class DiskDir(DiskCommon): :param gid: group ID container object should assume """ - def __init__(self, path, account, container, logger, + def __init__(self, path, drive, account, container, logger, uid=DEFAULT_UID, gid=DEFAULT_GID): self.root = path if container: @@ -157,11 +158,9 @@ class DiskDir(DiskCommon): else: self.container = None if self.container: - self.datadir = os.path.join(path, account, self.container) + self.datadir = os.path.join(path, drive, self.container) else: - self.datadir = os.path.join(path, account) - # Note that the account name has a one-to-one mapping to the gluster - # mount point, or volume name. + self.datadir = os.path.join(path, drive) self.account = account assert logger is not None self.logger = logger @@ -415,8 +414,8 @@ class DiskDir(DiskCommon): class DiskAccount(DiskDir): - def __init__(self, root, account, logger): - super(DiskAccount, self).__init__(root, account, None, logger) + def __init__(self, root, drive, account, logger): + super(DiskAccount, self).__init__(root, drive, account, None, logger) assert self.dir_exists def list_containers_iter(self, limit, marker, end_marker, |