[glusterfs] 3.3.1-8 revised patch to DiskFile.py for stalled GET

[Kaleb S. KEITHLEY]

commit fc58c441437150873bf97f61763cd1ddb37ff602
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Jan 10 10:26:35 2013 -0500

    3.3.1-8
    revised patch to DiskFile.py for stalled GET

 ...1.ufo.gluster.swift.common.DiskFile-1.7.4.patch |   31 +++++++------------
 glusterfs.spec                                     |    5 ++-
 2 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/glusterfs-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch b/glusterfs-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch
index 0960108..24af87f 100644
--- a/glusterfs-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch
+++ b/glusterfs-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch
@@ -1,19 +1,12 @@
-*** ufo/gluster/swift/common/DiskFile.py.orig	2012-12-21 11:40:12.763297073 -0500
---- ufo/gluster/swift/common/DiskFile.py	2012-12-21 11:14:59.248241815 -0500
-***************
-*** 55,61 ****
-  
-      def __init__(self, path, device, partition, account, container, obj,
-                   logger, keep_data_fp=False, disk_chunk_size=65536,
-!                  uid=DEFAULT_UID, gid=DEFAULT_GID):
-          self.disk_chunk_size = disk_chunk_size
-          #Don't support obj_name ending/begining with '/', like /a, a/, /a/b/ etc
-          obj = obj.strip('/')
---- 55,61 ----
-  
-      def __init__(self, path, device, partition, account, container, obj,
-                   logger, keep_data_fp=False, disk_chunk_size=65536,
-!                  uid=DEFAULT_UID, gid=DEFAULT_GID, iter_hook=None):
-          self.disk_chunk_size = disk_chunk_size
-          #Don't support obj_name ending/begining with '/', like /a, a/, /a/b/ etc
-          obj = obj.strip('/')
+--- ufo/gluster/swift/common/DiskFile.py.orig	2012-12-21 11:40:12.763297073 -0500
++++ ufo/gluster/swift/common/DiskFile.py	2013-01-09 16:44:02.607838685 -0500
+@@ -55,7 +55,8 @@
+ 
+     def __init__(self, path, device, partition, account, container, obj,
+                  logger, keep_data_fp=False, disk_chunk_size=65536,
+-                 uid=DEFAULT_UID, gid=DEFAULT_GID):
++                 uid=DEFAULT_UID, gid=DEFAULT_GID, iter_hook=None):
++        self.iter_hook = iter_hook
+         self.disk_chunk_size = disk_chunk_size
+         #Don't support obj_name ending/begining with '/', like /a, a/, /a/b/ etc
+         obj = obj.strip('/')
diff --git a/glusterfs.spec b/glusterfs.spec
index 9fc84e6..d704471 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -33,7 +33,7 @@
 Summary:          Cluster File System
 Name:             glusterfs
 Version:          3.3.1
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv3+ and (GPLv2 or LGPLv3+)
 Group:            System Environment/Base
 Vendor:           Red Hat
@@ -1111,6 +1111,9 @@ fi
 
 
 %changelog
+* Thu Jan 10 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-8
+- revised patch to DiskFile.py for stalled GET
+
 * Wed Jan 9 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-7
 - additional file ownerships and associated %ghosts from upstream
 - add BuildRequires libaio-devel to auto-enable AIO in configure,