summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2012-10-29 20:51:12 -0400
committerVijay Bellur <vbellur@redhat.com>2012-11-16 04:47:09 -0800
commitd2040d1213d0486d36ddb8280a232ef64d81a481 (patch)
tree0e7fc31c158926392584f4d677182a3c617d0008
parent6bd81f29d9cb6dc7131115629b9b6ca03dff2c4d (diff)
object-storage: remove the device and part params
Change-Id: I60b4b1b976ad8359ba072d5d0ed6a8dd2087a738 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/4174 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Mohammed Junaid <junaid@redhat.com> Tested-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rw-r--r--swift/1.4.8/plugins/DiskDir.py6
-rw-r--r--swift/1.4.8/swift.diff9
2 files changed, 6 insertions, 9 deletions
diff --git a/swift/1.4.8/plugins/DiskDir.py b/swift/1.4.8/plugins/DiskDir.py
index a9e39fd4c4f..65845b93308 100644
--- a/swift/1.4.8/plugins/DiskDir.py
+++ b/swift/1.4.8/plugins/DiskDir.py
@@ -140,8 +140,6 @@ class DiskDir(DiskCommon):
Manage object files on disk.
:param path: path to devices on the node
- :param device: device name (unused, ignored)
- :param partition: partition on the device the object lives in (unused, ignored)
:param account: account name for the object
:param container: container name for the object
:param logger: account or container server logging object
@@ -149,7 +147,7 @@ class DiskDir(DiskCommon):
:param gid: group ID container object should assume
"""
- def __init__(self, path, device, partition, account, container, logger,
+ def __init__(self, path, account, container, logger,
uid=DEFAULT_UID, gid=DEFAULT_GID):
self.root = path
if container:
@@ -422,7 +420,7 @@ class DiskDir(DiskCommon):
class DiskAccount(DiskDir):
def __init__(self, root, account, logger):
- super(DiskAccount, self).__init__(root, None, None, account, None, logger)
+ super(DiskAccount, self).__init__(root, account, None, logger)
assert self.dir_exists
def list_containers_iter(self, limit, marker, end_marker,
diff --git a/swift/1.4.8/swift.diff b/swift/1.4.8/swift.diff
index 889a3b1cd21..5ce314f5525 100644
--- a/swift/1.4.8/swift.diff
+++ b/swift/1.4.8/swift.diff
@@ -74,7 +74,7 @@ index 800b3c0..78fbf07 100644
headers = {
'X-Account-Container-Count': info['container_count'],
diff --git a/swift/container/server.py b/swift/container/server.py
-index 8a18cfd..c4982f1 100644
+index 8a18cfd..e39f5ef 100644
--- a/swift/container/server.py
+++ b/swift/container/server.py
@@ -1,4 +1,5 @@
@@ -112,17 +112,16 @@ index 8a18cfd..c4982f1 100644
self.node_timeout = int(conf.get('node_timeout', 3))
self.conn_timeout = float(conf.get('conn_timeout', 0.5))
self.allowed_sync_hosts = [h.strip()
-@@ -73,6 +83,9 @@ class ContainerController(object):
+@@ -73,6 +83,8 @@ class ContainerController(object):
:param container: container name
:returns: ContainerBroker object
"""
+ if Gluster_enabled():
-+ return DiskDir(self.root, drive, part, account,
-+ container, self.logger)
++ return DiskDir(self.root, account, container, self.logger)
hsh = hash_path(account, container)
db_dir = storage_directory(DATADIR, part, hsh)
db_path = os.path.join(self.root, drive, db_dir, hsh + '.db')
-@@ -245,6 +258,9 @@ class ContainerController(object):
+@@ -245,6 +257,9 @@ class ContainerController(object):
broker.stale_reads_ok = True
if broker.is_deleted():
return HTTPNotFound(request=req)