rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.1.3, removing patches.

Browse Source
This commit is contained in:
Jonathan Steffan 2011-04-03 15:28:29 -06:00
parent b70000182e
commit 06c8da013d
8 changed files with 32 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ glusterfs-3.0.5.tar.gz
/glusterfs-3.0.7.tar.gz
/glusterfs-3.1.1.tar.gz
/glusterfs-3.1.2.tar.gz
/glusterfs-3.1.3.tar.gz

67
dht-fsetxattr.patch
View File

@ -1,67 +0,0 @@
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index e204726..df0033a 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -2068,6 +2068,50 @@ err:
return 0;
}
+int
+dht_fsetxattr (call_frame_t *frame, xlator_t *this,
+ fd_t *fd, dict_t *xattr, int flags)
+{
+ xlator_t *subvol = NULL;
+ dht_local_t *local = NULL;
+ int op_errno = EINVAL;
+
+ VALIDATE_OR_GOTO (frame, err);
+ VALIDATE_OR_GOTO (this, err);
+ VALIDATE_OR_GOTO (fd, err);
+ VALIDATE_OR_GOTO (fd->inode, err);
+
+ subvol = dht_subvol_get_cached (this, fd->inode);
+ if (!subvol) {
+ gf_log (this->name, GF_LOG_DEBUG,
+ "no cached subvolume for fd=%p", fd);
+ op_errno = EINVAL;
+ goto err;
+ }
+
+ local = dht_local_init (frame);
+ if (!local) {
+ op_errno = ENOMEM;
+ gf_log (this->name, GF_LOG_ERROR,
+ "Out of memory");
+ goto err;
+ }
+
+ local->inode = inode_ref (fd->inode);
+ local->call_cnt = 1;
+
+ STACK_WIND (frame, dht_err_cbk, subvol, subvol->fops->fsetxattr,
+ fd, xattr, flags);
+
+ return 0;
+
+err:
+ op_errno = (op_errno == -1) ? errno : op_errno;
+ DHT_STACK_UNWIND (fsetxattr, frame, -1, op_errno);
+
+ return 0;
+}
+
int
dht_removexattr (call_frame_t *frame, xlator_t *this,
diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c
index 93d01f1..3f81ba7 100644
--- a/xlators/cluster/dht/src/dht.c
+++ b/xlators/cluster/dht/src/dht.c
@@ -491,6 +491,7 @@ struct xlator_fops fops = {
.access = dht_access,
.readlink = dht_readlink,
.setxattr = dht_setxattr,
+ .fsetxattr = dht_fsetxattr,
.getxattr = dht_getxattr,
.removexattr = dht_removexattr,
.open = dht_open,

2
glusterd.logrotate
View File

@ -1,4 +1,4 @@
/var/log/glusterd/glusterd.log {
/var/log/glusterfs/*glusterd.vol.log {
missingok
postrotate
/bin/kill -HUP `cat /var/run/glusterd.pid 2>/dev/null` 2>/dev/null || true

62
glusterfs.spec
View File

@ -1,20 +1,21 @@
%global major_minor 3.1
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
%{?_without_epoll:%global _without_epoll --disable-epoll}
%{?_with_fusermount:%gobal _with_fusermount --enable-fusermount}
# No RDMA Support on x390(x)
%ifarch s390 s390x
%global with_ib 0
%else
%global with_ib 1
%{?_without_rdma:%global _without_rdma --disable-ibverbs}
%endif
Name: glusterfs
Version: %{major_minor}.2
Release: 4%{?dist}
Version: 3.1.3
Release: 1%{?dist}
Summary: Clustered file-system
Group: System Environment/Base
License: AGPLv3
URL: http://www.gluster.org/
Source0: http://download.gluster.com/pub/gluster/glusterfs/%{major_minor}/%{version}/glusterfs-%{version}.tar.gz
Source0: http://download.gluster.com/pub/gluster/glusterfs/3.1/%{version}/glusterfs-%{version}.tar.gz
Source1: glusterd.init
Source2: glusterd.sysconfig
Source3: umount.glusterfs
@ -26,15 +27,6 @@ Source12: glusterfsd.sysconfig
Source15: glusterfsd.logrotate
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# bugs.gluster.com #2309 (pending)
Patch1: wb-quota.patch
# bugs.gluster.com #2311 (pending)
Patch2: dht-fsetxattr.patch
# CloudFS-specific
Patch3: inode-gen.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc
@ -50,6 +42,7 @@ Obsoletes: %{name}-libs <= 2.0.0
Obsoletes: %{name}-common < 3.1.0
Provides: %{name}-libs = %{version}-%{release}
Provides: %{name}-common = %{version}-%{release}
Provides: %{name}-core = %{version}-%{release}
%description
GlusterFS is a clustered file-system capable of scaling to several
@ -64,7 +57,7 @@ This package includes the glusterfs binary, the glusterfsd daemon and the
gluster command line, libglusterfs and glusterfs translator modules common to
both GlusterFS server and client framework.
%if %{with_ib}
%if 0%{!?_without_rdma:1}
%package rdma
Summary: Support for ib-verbs
Group: Applications/File
@ -109,6 +102,7 @@ This package provides support to FUSE based clients.
Summary: Clustered file-system server
Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release}
Requires: %{name}-fuse = %{version}-%{release}
%description server
GlusterFS is a clustered file-system capable of scaling to several
@ -155,12 +149,9 @@ This package provides the development libraries.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure
%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount}
# Remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -170,7 +161,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{__make}
%install
rm -rf %{buildroot}
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
# We'll use our init.d
@ -249,32 +240,26 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
%{buildroot}%{_datadir}/vim/vimfiles/syntax/glusterfs.vim
%clean
rm -rf %{buildroot}
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING INSTALL README THANKS
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
%{_datadir}/glusterfs
%{_bindir}/glusterfs-volgen
%{_libdir}/glusterfs
%{_libdir}/*.so.*
%{_sbindir}/glusterfs*
%{_bindir}/glusterfs-defrag
%{_sbindir}/gluster
%{_sbindir}/glusterd
%{_mandir}/man8/*glusterfs.8*
%{_mandir}/man8/*gluster.8*
%{_mandir}/man8/*glusterd.8*
%{_mandir}/man8/*glusterfs-volgen.8*
%{_mandir}/man8/*gluster*.8*
%dir %{_localstatedir}/log/glusterfs
%if %{with_ib}
%if 0%{!?_without_rdma:1}
%exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
%endif
%exclude %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
%if %{with_ib}
%if 0%{!?_without_rdma:1}
%files rdma
%defattr(-,root,root,-)
%{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
@ -287,8 +272,13 @@ rm -rf %{buildroot}
%{_mandir}/man8/mount.glusterfs.8*
/sbin/mount.glusterfs
/sbin/umount.glusterfs
%if 0%{?_with_fusermount:1}
%{_bindir}/fusermount-glusterfs
%endif
%files server
%defattr(-,root,root,-)
%doc examples/ doc/glusterfs*.vol.sample
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd
@ -307,6 +297,7 @@ rm -rf %{buildroot}
%{_datadir}/vim/vimfiles/syntax/glusterfs.vim
%files devel
%defattr(-,root,root,-)
%{_includedir}/glusterfs
%exclude %{_includedir}/glusterfs/y.tab.h
%{_libdir}/*.so
@ -340,8 +331,11 @@ if [ $1 -ge 1 ]; then
fi
%changelog
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Mar 19 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.3-1
- Update to 3.1.3
- Merge in more upstream SPEC changes
- Remove patches from GlusterFS bugzilla #2309 and #2311
- Remove inode-gen.patch
* Sun Feb 06 2011 Jonathan Steffan <jsteffan@fedoraproject.org> - 3.1.2-3
- Add back in legacy SPEC elements to support older branches

2
glusterfsd.logrotate
View File

@ -1,4 +1,4 @@
/var/log/glusterfs/glusterfsd.log {
/var/log/glusterfs/*glusterfsd.log /var/log/glusterfs/bricks/*.log {
missingok
postrotate
/bin/kill -HUP `cat /var/run/glusterfsd.pid 2>/dev/null` 2>/dev/null || true

12
inode-gen.patch
View File

@ -1,12 +0,0 @@
diff --git a/libglusterfs/src/inode.h b/libglusterfs/src/inode.h
index 15a4f98..3c95407 100644
--- a/libglusterfs/src/inode.h
+++ b/libglusterfs/src/inode.h
@@ -104,6 +104,7 @@ struct _inode {
struct list_head list; /* active/lru/purge */
struct _inode_ctx *_ctx; /* replacement for dict_t *(inode->ctx) */
+ uint64_t gen; /* for locking code */
};

2
sources
View File

@ -1 +1 @@
9dee75180db951cde971722f80779769 glusterfs-3.1.2.tar.gz
360fdd2a10446b93d72a962252dc85c4 glusterfs-3.1.3.tar.gz

32
wb-quota.patch
View File

@ -1,32 +0,0 @@
diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c
index 43956a9..d97812a 100644
--- a/xlators/performance/write-behind/src/write-behind.c
+++ b/xlators/performance/write-behind/src/write-behind.c
@@ -1667,7 +1667,8 @@ __wb_get_other_requests (list_head_t *list, list_head_t *other_requests)
int32_t
wb_stack_unwind (list_head_t *unwinds)
{
- struct iatt buf = {0,};
+ struct iatt prebuf = {0,};
+ struct iatt postbuf = {0,};
wb_request_t *request = NULL, *dummy = NULL;
call_frame_t *frame = NULL;
wb_local_t *local = NULL;
@@ -1678,8 +1679,15 @@ wb_stack_unwind (list_head_t *unwinds)
frame = request->stub->frame;
local = frame->local;
- STACK_UNWIND (frame, local->op_ret, local->op_errno, &buf,
- &buf);
+ /*
+ * There are probably a lot of other problems with returning
+ * these bogus iatts, but this fix at least gives us enough
+ * information for features/quota to work (sort of).
+ */
+ postbuf.ia_blocks = (request->write_size + 511) / 512;
+
+ STACK_UNWIND (frame, local->op_ret, local->op_errno,
+ &prebuf, &postbuf);
ret = wb_request_unref (request);
if (ret == 0) {