From 677d30716978615d0499344ac0a62c2755a486cf Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Mon, 8 Jul 2013 14:10:45 -0400 Subject: Final forward port of PDQ performance patches Change-Id: I4ef131b3cc7648d4571a4d854029efb1aff8b901 Signed-off-by: Peter Portante Reviewed-on: http://review.gluster.org/5305 Reviewed-by: Luis Pabon Tested-by: Luis Pabon --- gluster/swift/common/constraints.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gluster/swift/common/constraints.py') diff --git a/gluster/swift/common/constraints.py b/gluster/swift/common/constraints.py index ce1df31..9a4d57e 100644 --- a/gluster/swift/common/constraints.py +++ b/gluster/swift/common/constraints.py @@ -91,23 +91,8 @@ def gluster_check_object_creation(req, object_name): # Replace the original check object creation with ours swift.common.constraints.check_object_creation = gluster_check_object_creation -# Save the original check mount -__check_mount = swift.common.constraints.check_mount - - -# Define our new one which invokes the original -def gluster_check_mount(root, drive): - # FIXME: Potential performance optimization here to not call the original - # check mount which makes two stat calls. We could do what they do with - # just one. - if __check_mount(root, drive): - return True - - return Glusterfs.mount(root, drive) - - # Replace the original check mount with ours -swift.common.constraints.check_mount = gluster_check_mount +swift.common.constraints.check_mount = Glusterfs.mount # Save the original Ring class __Ring = _ring.Ring -- cgit