Forward port PDQ 3489: turn off cont & act updates

This is a simple sub-classing of the proper update methods to
just no-op their behavior.

Change-Id: Ib1ae5234d372cbce572da34cfe702235b78f2310
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5088
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>

1 files changed, 25 insertions, 1 deletions

diff --git a/gluster/swift/container/server.py b/gluster/swift/container/server.py
index ee284c9..36632a6 100644
--- a/gluster/swift/container/server.py
+++ b/gluster/swift/container/server.py
@@ -24,6 +24,15 @@ from gluster.swift.common.DiskDir import DiskDir
 
 
 class ContainerController(server.ContainerController):
+    """
+    Subclass of the container server's ContainerController which replaces the
+    _get_container_broker() method so that we can use Gluster's DiskDir
+    duck-type of the container DatabaseBroker object, and make the
+    account_update() method a no-op (information is simply stored on disk and
+    already updated by virtue of performaing the file system operations
+    directly).
+    """
+
     def _get_container_broker(self, drive, part, account, container):
         """
         Overriden to provide the GlusterFS specific broker that talks to
@@ -34,10 +43,25 @@ class ContainerController(server.ContainerController):
         :param part: partition the container is in
         :param account: account name
         :param container: container name
-        :returns: DiskDir object
+        :returns: DiskDir object, a duck-type of DatabaseBroker
         """
         return DiskDir(self.root, drive, account, container, self.logger)
 
+    def account_update(self, req, account, container, broker):
+        """
+        Update the account server(s) with latest container info.
+
+        For Gluster, this is just a no-op, since an account is just the
+        directory holding all the container directories.
+
+        :param req: swob.Request object
+        :param account: account name
+        :param container: container name
+        :param broker: container DB broker object
+        :returns: None.
+        """
+        return None
+
 
 def app_factory(global_conf, **local_conf):
     """paste.deploy app factory for creating WSGI container server apps."""