From db8ed6acee7af6034160b7b6921c97db2c8bfd81 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Mon, 16 May 2016 11:28:12 -0400 Subject: [PATCH] 3.8.0 RC1 --- glusterfs-3.8.0rc1.VERSION.patch | 6 + glusterfs.spec | 283 ++++++++++++++----------------- sources | 2 +- 3 files changed, 131 insertions(+), 160 deletions(-) create mode 100644 glusterfs-3.8.0rc1.VERSION.patch diff --git a/glusterfs-3.8.0rc1.VERSION.patch b/glusterfs-3.8.0rc1.VERSION.patch new file mode 100644 index 0000000..fb800c7 --- /dev/null +++ b/glusterfs-3.8.0rc1.VERSION.patch @@ -0,0 +1,6 @@ +--- glusterfs-3.8rc1/VERSION.orig 2016-05-16 10:59:02.691769734 -0400 ++++ glusterfs-3.8rc1/VERSION 2016-05-16 11:01:16.408769734 -0400 +@@ -1 +1 @@ +-v3.8rc1-0 +\ No newline at end of file ++v3.8.0rc1 diff --git a/glusterfs.spec b/glusterfs.spec index bdd1689..5b90436 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -3,12 +3,16 @@ %global _for_fedora_koji_builds 1 # uncomment and add '%' to use the prereltag for pre-releases -# %%global prereltag beta2 +%global prereltag rc1 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted ## +# if you wish to compile an rpm with debugging... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with debug +%{?_with_debug:%global _with_debug --enable-debug} + # if you wish to compile an rpm with cmocka unit testing... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka %{?_with_cmocka:%global _with_cmocka --enable-cmocka} @@ -63,15 +67,6 @@ %global _without_bd --disable-bd-xlator %endif -# if you wish to compile an rpm without the qemu-block support... -# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without qemu-block -%{?_without_qemu_block:%global _without_qemu_block --disable-qemu-block} - -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -# xlators/features/qemu-block fails to build on RHEL5, disable it -%global _without_qemu_block --disable-qemu-block -%endif - # Disable data-tiering on EL5, sqlite is too old %if ( 0%{?rhel} && 0%{?rhel} < 6 ) %global _without_tiering --disable-tiering @@ -95,9 +90,6 @@ %global _with_tmpfilesdir --without-tmpfilesdir %endif -# there is no systemtap support! Perhaps some day there will be -%global _without_systemtap --enable-systemtap=no - # From https://fedoraproject.org/wiki/Packaging:Python#Macros %if ( 0%{?rhel} && 0%{?rhel} < 6 ) %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -168,8 +160,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.7.11 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.8.0 +Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -181,12 +173,13 @@ License: GPLv2 or LGPLv3+ Group: System Environment/Base URL: http://www.gluster.org/docs/index.php/GlusterFS %if ( 0%{_for_fedora_koji_builds} ) -Source0: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz +Source0: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-3.8%{?prereltag}.tar.gz Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig Source6: rhel5-load-fuse-modules Source7: glusterfsd.service Source8: glusterfsd.init +Patch0: glusterfs-3.8.0rc1.VERSION.patch %else Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif @@ -224,15 +217,9 @@ BuildRequires: libcmocka-devel >= 1.0.1 %if ( 0%{!?_without_tiering:1} ) BuildRequires: sqlite-devel %endif -%if ( 0%{!?_without_systemtap:1} ) -BuildRequires: systemtap-sdt-devel -%endif %if ( 0%{!?_without_bd:1} ) BuildRequires: lvm2-devel %endif -%if ( 0%{!?_without_qemu_block:1} ) -BuildRequires: glib2-devel -%endif %if ( 0%{!?_without_georeplication:1} ) BuildRequires: libattr-devel %endif @@ -392,7 +379,6 @@ is in user space and easily manageable. This package provides support to FUSE based clients and includes the glusterfsd and glusterfs binaries. -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) %package ganesha Summary: NFS-Ganesha configuration Group: Applications/File @@ -415,7 +401,6 @@ is in user space and easily manageable. This package provides the configuration and related files for using NFS-Ganesha as the NFS server using GlusterFS -%endif %if ( 0%{!?_without_georeplication:1} ) %package geo-replication @@ -523,7 +508,11 @@ License: GPLv3+ BuildArch: noarch %endif # this Group handling comes from the Fedora resource-agents package +%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} ) Group: System Environment/Base +%else +Group: Productivity/Clustering/HA +%endif # for glusterd Requires: %{name}-server = %{version}-%{release} # depending on the distribution, we need pacemaker or resource-agents @@ -548,7 +537,6 @@ Summary: Distributed file-system server Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-api = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release} # some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse Requires: %{name}-fuse = %{version}-%{release} @@ -556,7 +544,7 @@ Requires: %{name}-fuse = %{version}-%{release} Requires: %{name}-api = %{version}-%{release} Requires: %{name}-client-xlators = %{version}-%{release} # psmisc for killall, lvm2 for snapshot, and nfs-utils and -# and rpcbind/portmap for gnfs server +# rpcbind/portmap for gnfs server Requires: psmisc Requires: lvm2 Requires: nfs-utils @@ -596,19 +584,18 @@ This package provides the glusterfs server daemon. %prep -%setup -q -n %{name}-%{version}%{?prereltag} +%setup -q -n %{name}-3.8%{?prereltag} +%patch0 -p1 %build -# For whatever reason, install-sh is sometimes missing. When this gets fixed, -# there is no need to run ./autogen or have a BuildRequires for automake. -[ -e 'install-sh' -o -e 'install.sh' ] || ./autogen.sh %if ( 0%{?rhel} && 0%{?rhel} < 6 ) CFLAGS=-DUSE_INSECURE_OPENSSL export CFLAGS %endif -%configure \ + ./autogen.sh && %configure \ %{?_with_cmocka} \ + %{?_with_debug} \ %{?_with_tmpfilesdir} \ %{?_without_bd} \ %{?_without_epoll} \ @@ -616,10 +603,8 @@ export CFLAGS %{?_without_georeplication} \ %{?_with_firewalld} \ %{?_without_ocf} \ - %{?_without_qemu_block} \ %{?_without_rdma} \ %{?_without_syslog} \ - %{?_without_systemtap} \ %{?_without_tiering} # fix hardening and remove rpath in shlibs @@ -631,36 +616,15 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool make %{?_smp_mflags} -# Build Glupy -pushd xlators/features/glupy/src -FLAGS="$RPM_OPT_FLAGS" python setup.py build -popd - %check make check %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -# install the Glupy Python library in /usr/lib/python*/site-packages -pushd xlators/features/glupy/src -python setup.py install --skip-build --verbose --root %{buildroot} -popd # Install include directory -mkdir -p %{buildroot}%{_includedir}/glusterfs -install -p -m 0644 libglusterfs/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/ install -p -m 0644 contrib/uuid/*.h \ %{buildroot}%{_includedir}/glusterfs/ -# Following needed by hekafs multi-tenant translator -mkdir -p %{buildroot}%{_includedir}/glusterfs/rpc -install -p -m 0644 rpc/rpc-lib/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/rpc/ -install -p -m 0644 rpc/xdr/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/rpc/ -mkdir -p %{buildroot}%{_includedir}/glusterfs/server -install -p -m 0644 xlators/protocol/server/src/*.h \ - %{buildroot}%{_includedir}/glusterfs/server/ %if ( 0%{_for_fedora_koji_builds} ) install -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/sysconfig/glusterd @@ -682,7 +646,6 @@ mkdir -p %{buildroot}%{_localstatedir}/log/glusterd mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd mkdir -p %{buildroot}%{_localstatedir}/run/gluster -touch %{buildroot}%{python_sitelib}/gluster/__init__.py # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -709,11 +672,6 @@ EOM rm -rf %{buildroot}/benchmarking rm -f %{buildroot}/glusterfs-mode.el rm -f %{buildroot}/glusterfs.vim -rm -rf %{buildroot}%{_libexecdir}/glusterfs/gfind_missing_files -rm -f %{buildroot}%{_sbindir}/gfind_missing_files -rm -rf %{buildroot}%{_sysconfdir}/ganesha -rm -rf %{buildroot}%{_libexecdir}/ganesha -rm -f %{buildroot}%{_prefix}/lib/ocf/resource.d/heartbeat/ganesha_* %else # make install always puts these in %%{_defaultdocdir}/%%{name} so don't # use %%{_pkgdocdir}; that will be wrong on later Fedora distributions @@ -748,33 +706,19 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \ # the rest of the ghosts touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info touch %{buildroot}%{_sharedstatedir}/glusterd/options -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1 -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/start/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/set/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/create/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/copy-file/pre -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post -mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre +subdirs=(add-brick create copy-file delete gsync-create remove-brick reset set start stop) +for dir in ${subdirs[@]}; do + mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/"$dir"/{pre,post} +done mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/glustershd mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/peers mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/vols mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run +mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/bitd +mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/quotad +mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/scrub +mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/snaps +mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/ss_brick touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid @@ -786,10 +730,6 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus install -p -m 0755 -D extras/command-completion/gluster.bash \ %{buildroot}%{_sysconfdir}/bash_completion.d/gluster -mv %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.* %{buildroot}%{_libexecdir}/glusterfs/ -ln -s %{_libexecdir}/glusterfs/S57glusterfind-delete-post.py %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py - - %clean rm -rf %{buildroot} @@ -805,7 +745,6 @@ rm -rf %{buildroot} %endif exit 0 - %post api -p /sbin/ldconfig %if ( 0%{?rhel} == 5 ) @@ -822,12 +761,16 @@ fi exit 0 %endif -%post libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +exit 0 %post server # Legacy server %_init_enable glusterd +%if ( 0%{_for_fedora_koji_builds} ) %_init_enable glusterfsd +%endif # ".cmd_log_history" is renamed to "cmd_history.log" in GlusterFS-3.7 . # While upgrading glusterfs-server package form GlusterFS version <= 3.6 to # GlusterFS version 3.7, ".cmd_log_history" should be renamed to @@ -923,11 +866,22 @@ exit 0 ##----------------------------------------------------------------------------- ## All %%postun should be placed here and keep them sorted ## -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +%if ( 0%{!?_without_syslog:1} ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%_init_restart rsyslog +%endif +%endif +exit 0 -%postun api -p /sbin/ldconfig +%postun api +/sbin/ldconfig +exit 0 -%postun libs -p /sbin/ldconfig +%postun libs +/sbin/ldconfig +exit 0 %postun server /sbin/ldconfig @@ -973,6 +927,7 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/fdl.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so @@ -1014,14 +969,12 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/ganesha.so -%if ( 0%{!?_without_qemu_block:1} ) -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/qemu-block.so -%endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2c.so %files devel -%{_includedir}/glusterfs -%exclude %{_includedir}/glusterfs/y.tab.h +%dir %{_includedir}/glusterfs +%{_includedir}/glusterfs/* %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so %{_libdir}/*.so @@ -1046,10 +999,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files %{python_sitelib}/gluster/glupy/* -# Don't expect a .egg-info file on EL5 -%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) -%{python_sitelib}/glusterfs_glupy*.egg-info -%endif %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. @@ -1067,40 +1016,39 @@ exit 0 %endif %endif -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) %files ganesha %{_sysconfdir}/ganesha/* -%dir %{_libexecdir}/ganesha -%attr(0755,-,-) %{_libexecdir}/ganesha/* -%attr(0755,-,-) %{_prefix}/lib/ocf/resource.d/heartbeat/* +%{_libexecdir}/ganesha/* +%{_prefix}/lib/ocf/resource.d/heartbeat/* %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh %{_sharedstatedir}/glusterd/hooks/1/reset/post/S31ganesha-reset.sh -%endif %if ( 0%{!?_without_georeplication:1} ) %files geo-replication %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-georep + +%{_sbindir}/gfind_missing_files %{_libexecdir}/glusterfs/gsyncd %{_libexecdir}/glusterfs/python/syncdaemon/* %{_libexecdir}/glusterfs/gverify.sh %{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh %{_libexecdir}/glusterfs/peer_gsec_create %{_libexecdir}/glusterfs/peer_mountbroker -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication -%dir %{_sharedstatedir}/glusterd/hooks -%dir %{_sharedstatedir}/glusterd/hooks/1 -%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create -%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post -%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh +%{_libexecdir}/glusterfs/gfind_missing_files + + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication +%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre + %{_datadir}/glusterfs/scripts/get-gfid.sh %{_datadir}/glusterfs/scripts/slave-upgrade.sh %{_datadir}/glusterfs/scripts/gsync-upgrade.sh %{_datadir}/glusterfs/scripts/generate-gfid-file.sh %{_datadir}/glusterfs/scripts/gsync-sync-gfid %{_datadir}/glusterfs/scripts/schedule_georep.py* -%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf -%{_libexecdir}/glusterfs/gfind_missing_files -%{_sbindir}/gfind_missing_files %endif %files libs @@ -1126,7 +1074,8 @@ exit 0 %files regression-tests %{_prefix}/share/glusterfs/run-tests.sh %{_prefix}/share/glusterfs/tests -%exclude %{_datadir}/glusterfs/tests/basic/rpm.t +%exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t +%exclude %{_prefix}/share/glusterfs/tests/vagrant %endif %if ( 0%{!?_without_ocf:1} ) @@ -1137,32 +1086,20 @@ exit 0 %files server %doc extras/clear_xattrs.sh -%config(noreplace) %{_sysconfdir}/sysconfig/glusterd +# sysconf %config(noreplace) %{_sysconfdir}/glusterfs %dir %{_localstatedir}/run/gluster -%if 0%{?_tmpfilesdir:1} -%{_tmpfilesdir}/gluster.conf -%endif -%dir %{_sharedstatedir}/glusterd -%dir %{_sharedstatedir}/glusterd/groups -%config(noreplace) %{_sharedstatedir}/glusterd/groups/virt -# Legacy configs +%config(noreplace) %{_sysconfdir}/sysconfig/glusterd %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %endif -%{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh -%{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh -%{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh -%{_sharedstatedir}/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh -%{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh -%{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh -%{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh -%{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh + # init files %_init_glusterd %if ( 0%{_for_fedora_koji_builds} ) %_init_glusterfsd %endif + # binaries %{_sbindir}/glusterd %{_sbindir}/glfsheal @@ -1173,6 +1110,9 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbrc.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbr.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2s.so %if ( 0%{!?_without_tiering:1} ) %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so %endif @@ -1184,57 +1124,78 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage* +%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so %if ( 0%{!?_without_tiering:1} ) %{_libdir}/libgfdb.so.* %endif -#snap_scheduler +# snap_scheduler %{_sbindir}/snap_scheduler.py %{_sbindir}/gcron.py -#hookscripts -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1 -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop -%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre - -%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info -%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options -# This is really ugly, but I have no idea how to mark these directories in -# any other way. They should belong to the glusterfs-server package, but -# don't exist after installation. They are generated on the first start... +# /var/lib/glusterd, e.g. hookscripts, etc. +%ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/bitd + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups + %attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/virt + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind/.keys +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1 + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/post +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/pre + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post + %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/pre + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/reset/pre + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post/S30samba-set.sh + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/set/pre + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post/S29CTDBsetup.sh + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post/S30samba-start.sh %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid +%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/snaps +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/ss_brick +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols # Extra utility script %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh @@ -1243,14 +1204,18 @@ exit 0 %{_libexecdir}/glusterfs/glusterfind %{_bindir}/glusterfind %{_libexecdir}/glusterfs/peer_add_secret_pub -%{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py -%{_libexecdir}/glusterfs/S57glusterfind-delete-post.* %if ( 0%{?_with_firewalld:1} ) %{_prefix}/lib/firewalld/services/glusterfs.xml %endif +%{_sbindir}/gf_logdump +%{_sbindir}/gf_recon + %changelog +* Mon May 16 2016 Kaleb S. KEITHLEY - 3.8.0-0.1rc1 +- 3.8.0 RC1 + * Wed Apr 27 2016 Kaleb S. KEITHLEY - 3.7.11-2 - %postun libs on RHEL6 w/o firewalld diff --git a/sources b/sources index e17b315..798f201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b617d007c967cc482abf1077e2a2968f glusterfs-3.7.11.tar.gz +52a146ad28525b8b447d1b9bcc5c36e7 glusterfs-3.8rc1.tar.gz