diff options
| author | Peter Portante <peter.portante@redhat.com> | 2013-07-15 16:52:46 -0400 |
|---|---|---|
| committer | Luis Pabon <lpabon@redhat.com> | 2013-08-21 19:38:35 -0700 |
| commit | 9d4e67e741f13b4b93620fbb972886e1dc975fee (patch) | |
| tree | b6862ed79251d46771f87bbc25791f8e8d1eb29e /gluster/swift/container/server.py | |
| parent | 54bb5bec7a025eecb51f85274ec37dbd0c478758 (diff) | |
Updates to support Havana interim version 1.9.1.
The code changes are basically:
* Apply refactoring in the DiskFile class to use the new DiskWriter
abstraction
* Move and rename our diskfile module to match upstream
* ThreadPools allow us to remove the tpool usage around fsync
* Update the Ring subclass to support the get_part() method
* Update to use the 1.9.1 proxy server unit tests
* Move the DebugLogger class to test.unit
* Rebuild the Rings to use the new layout
* Remove backup ring builder files
* Update spec files to 1.9.1, and tox to use swift 1.9.1
* Updated version to 1.9.0-0
Change-Id: Ica12cac8b351627d67500723f1dbd8a54d45f7c8
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5331
Diffstat (limited to 'gluster/swift/container/server.py')
| -rw-r--r-- | gluster/swift/container/server.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gluster/swift/container/server.py b/gluster/swift/container/server.py index 780a300..e832248 100644 --- a/gluster/swift/container/server.py +++ b/gluster/swift/container/server.py @@ -33,7 +33,7 @@ class ContainerController(server.ContainerController): directly). """ - def _get_container_broker(self, drive, part, account, container): + def _get_container_broker(self, drive, part, account, container, **kwargs): """ Overriden to provide the GlusterFS specific broker that talks to Gluster for the information related to servicing a given request @@ -45,7 +45,8 @@ class ContainerController(server.ContainerController): :param container: container name :returns: DiskDir object, a duck-type of DatabaseBroker """ - return DiskDir(self.root, drive, account, container, self.logger) + return DiskDir(self.root, drive, account, container, self.logger, + **kwargs) def account_update(self, req, account, container, broker): """ |