From dbde02b44482f485a229ff60b38a4eb1f3759a76 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 21 Dec 2012 12:38:43 -0500 Subject: [PATCH] fix object get --- ....gluster.swift.common.DiskFile-1.7.4.patch | 19 ++++++++++ glusterfs.spec | 38 +++++++++++-------- 2 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 glusterfs-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch 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 new file mode 100644 index 0000000..0960108 --- /dev/null +++ b/glusterfs-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch @@ -0,0 +1,19 @@ +*** 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('/') diff --git a/glusterfs.spec b/glusterfs.spec index 725d682..fb3b08d 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -33,7 +33,7 @@ Summary: Cluster File System Name: glusterfs Version: 3.3.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ and (GPLv2 or LGPLv3+) Group: System Environment/Base Vendor: Red Hat @@ -400,7 +400,7 @@ in clusters for reliable, redundant, and large-scale storage of static objects. This package contains documentation files for %{name}-swift. -%package swift-ufo +%package ufo Summary: GlusterFS Unified File and Object Storage. Group: Applications/System License: ASL 2.0 @@ -409,9 +409,12 @@ Requires: %{name}-swift = %{version}-%{release} Requires: memcached Requires: openssl Requires: python +Obsoletes: glusterfs-swift-plugin < 3.3.1-4 +Obsoletes: glusterfs-swift-ufo <= 3.3.1-4 Source20: http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/UFO/gluster-swift-ufo-%{UFOVER}.tar.gz +Patch20: %{name}-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch -%description swift-ufo +%description ufo Gluster Unified File and Object Storage unifies NAS and object storage technology. This provides a system for data storage that enables users to access the same data as an object and as a file, simplifying management and controlling @@ -435,6 +438,8 @@ cd swift-%{SWIFTVER} %endif %patch12 -p1 dos2unix LICENSE +cd ../ufo +%patch20 -p1 %endif %build @@ -912,7 +917,7 @@ fi %defattr(-,root,root,-) %doc swift-%{SWIFTVER}/LICENSE -%files swift-ufo +%files ufo %defattr(-,root,root,-) %{python_sitelib}/gluster %{python_sitelib}/gluster_swift_ufo-%{UFOVER}-*.egg-info @@ -1095,6 +1100,9 @@ fi %changelog +* Fri Dec 21 2012 Kaleb S. KEITHLEY - 3.3.1-6 +- fix object get, missing iter_hook param in DiskFile::__init__ + * Mon Dec 17 2012 Kaleb S. KEITHLEY - 3.3.1-5 - Update to OpenStack Swift 1.7.4 (Folsom) @@ -1104,7 +1112,7 @@ fi _plus_ our backport of the upstream constraints config changes that have been accepted into grizzly. -* Mon Nov 16 2012 Kaleb S. KEITHLEY - 3.3.1-3 +* Fri Nov 16 2012 Kaleb S. KEITHLEY - 3.3.1-3 - add Requires: rpcbind for minimum install systems where rpcbind isn't installed; usually this is a no-op. - Better logic to preserve contents of /etc/glusterd @@ -1113,7 +1121,7 @@ fi - Synchronize with openstack-swift-1.4.8 packaging changes, including systemd .service files and align with the matching sets of patches -* Mon Oct 11 2012 Kaleb S. KEITHLEY - 3.3.1-1 +* Thu Oct 11 2012 Kaleb S. KEITHLEY - 3.3.1-1 - GlusterFS-3.3.1 - save swift .conf files correctly during upgrade - fix glusterd restart in %post geo-replication @@ -1127,19 +1135,19 @@ fi * Tue Sep 18 2012 Kaleb S. KEITHLEY - 3.3.0-9 - python-paste-deploy on RHEL 6, glusterfsd.init -* Wed Sep 13 2012 Kaleb S. KEITHLEY - 3.3.0-8 +* Thu Sep 13 2012 Kaleb S. KEITHLEY - 3.3.0-8 - fix for glusterfs SEGV, BZ 856704, revised * Wed Sep 12 2012 Kaleb S. KEITHLEY - 3.3.0-7 - fix for glusterfs SEGV, BZ 856704 -* Wed Sep 7 2012 Kaleb S. KEITHLEY - 3.3.0-6 +* Fri Sep 7 2012 Kaleb S. KEITHLEY - 3.3.0-6 - glusterfs.spec cleanup * Mon Aug 27 2012 Kaleb S. KEITHLEY - 3.2.7-2 - fix SEGV in glusterd-rpc-ops.c, BZ 837684, f17 only. -* Wed Aug 12 2012 Kaleb S. KEITHLEY - 3.3.0-5 +* Sun Aug 12 2012 Kaleb S. KEITHLEY - 3.3.0-5 - now with UFO (openstack-swift) except on el5 * Fri Aug 10 2012 Kaleb S. KEITHLEY - 3.3.0-4 @@ -1217,13 +1225,13 @@ fi * Thu Jun 16 2011 Jonathan Steffan - 3.2.1-1 - Update to 3.2.1 -* Tue Jun 01 2011 Jonathan Steffan - 3.2.0-1 +* Wed Jun 01 2011 Jonathan Steffan - 3.2.0-1 - Update to 3.2.0 * Tue May 10 2011 Jonathan Steffan - 3.1.4-1 - Update to 3.1.4 -* Sun Mar 19 2011 Jonathan Steffan - 3.1.3-1 +* Sat Mar 19 2011 Jonathan Steffan - 3.1.3-1 - Update to 3.1.3 - Merge in more upstream SPEC changes - Remove patches from GlusterFS bugzilla #2309 and #2311 @@ -1232,7 +1240,7 @@ fi * Sun Feb 06 2011 Jonathan Steffan - 3.1.2-3 - Add back in legacy SPEC elements to support older branches -* Tue Feb 03 2011 Jonathan Steffan - 3.1.2-2 +* Thu Feb 03 2011 Jonathan Steffan - 3.1.2-2 - Add patches from CloudFS project * Tue Jan 25 2011 Jonathan Steffan - 3.1.2-1 @@ -1268,7 +1276,7 @@ fi * Sat Jan 2 2010 Jonathan Steffan - 2.0.9-1 - Update to 2.0.9 -* Sat Nov 8 2009 Jonathan Steffan - 2.0.8-1 +* Sun Nov 8 2009 Jonathan Steffan - 2.0.8-1 - Update to 2.0.8 - Remove install of glusterfs-volgen, it's properly added to automake upstream now @@ -1336,10 +1344,10 @@ fi * Fri May 9 2008 Matthias Saou 1.3.8-1 - Update to 1.3.8 final. -* Tue Apr 23 2008 Matthias Saou 1.3.8-0.10 +* Wed Apr 23 2008 Matthias Saou 1.3.8-0.10 - Include short patch to include fixes from latest TLA 751. -* Mon Apr 22 2008 Matthias Saou 1.3.8-0.9 +* Tue Apr 22 2008 Matthias Saou 1.3.8-0.9 - Update to 1.3.8pre6. - Include glusterfs binary in both the client and server packages, now that glusterfsd is a symlink to it instead of a separate binary.