diff --git a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch b/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch deleted file mode 100644 index c2229f1..0000000 --- a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a0a0afc59bb1d2deddfdb776bc9e49e02f58ce32 Mon Sep 17 00:00:00 2001 -From: "Kaleb S. KEITHLEY" -Date: Tue, 24 Jul 2018 14:40:51 -0400 -Subject: [PATCH] georep: fix hard-coded paths in gsyncd.conf.in - -Why anyone puts a hard-coded path like /usr/local/sbin in a -config file is beyond me. - -I wonder how many more are lurking in our sources - -Change-Id: I6523894416cc06236ea1f99529efd36e957bd98e -updates: bz#1193929 -Signed-off-by: Kaleb S. KEITHLEY ---- - geo-replication/gsyncd.conf.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in -index 0a842cf2b..bd04400ff 100644 ---- a/geo-replication/gsyncd.conf.in -+++ b/geo-replication/gsyncd.conf.in -@@ -138,11 +138,11 @@ value = - help=If SSH keys are not secured with gsyncd prefix then use this configuration to set the actual path of gsyncd(Usually /usr/libexec/glusterfs/gsyncd) - - [gluster-command-dir] --value=/usr/local/sbin/ -+value=@SBIN_DIR@ - help=Directory where Gluster binaries exist on master - - [slave-gluster-command-dir] --value=/usr/local/sbin/ -+value=@SBIN_DIR@ - help=Directory where Gluster binaries exist on slave - - [gluster-params] --- -2.17.1 - diff --git a/glusterd.sysconfig b/glusterd.sysconfig index 3a9cb86..d0e9c21 100644 --- a/glusterd.sysconfig +++ b/glusterd.sysconfig @@ -3,4 +3,3 @@ #GLUSTERD_LOGFILE="/var/log/gluster/gluster.log" #GLUSTERD_LOGLEVEL="NORMAL" - diff --git a/glusterfs-4.1.5.tar.gz b/glusterfs-4.1.5.tar.gz deleted file mode 100644 index d524c96..0000000 Binary files a/glusterfs-4.1.5.tar.gz and /dev/null differ diff --git a/glusterfs-7.0.tar.gz b/glusterfs-7.0.tar.gz new file mode 100644 index 0000000..d0e7c05 Binary files /dev/null and b/glusterfs-7.0.tar.gz differ diff --git a/glusterfs.spec b/glusterfs.spec index e4d4729..f92acc3 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -2,24 +2,21 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: glusterfs -Version: 4.1.5 -Release: 3 +Version: 7.0 +Release: 1 License: GPLv2 and LGPLv3+ Summary: Aggregating distributed file system URL: http://docs.gluster.org/ -Source0: http://download.gluster.org/pub/gluster/%{name}/4.1/%{version}/%{name}-%{version}.tar.gz -Patch0: python.patch -Patch1: 0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch +Source0: https://download.gluster.org/pub/gluster/glusterfs/7/7.0/glusterfs-7.0.tar.gz Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig -Source6: load-fuse-modules Source7: glusterfsd.service Source8: glusterfsd.init BuildRequires: systemd bison flex gcc make libtool ncurses-devel readline-devel libattr-devel -BuildRequires: libxml2-devel openssl-devel libaio-devel libacl-devel python2-devel git perl +BuildRequires: libxml2-devel openssl-devel libaio-devel libacl-devel python3-devel git perl BuildRequires: libtirpc-devel rpcgen libuuid-devel sqlite-devel lvm2-devel firewalld -BuildRequires: fuse-devel libibverbs-devel +BuildRequires: fuse-devel libibverbs-devel libcurl-devel BuildRequires: userspace-rcu-devel >= 0.7 BuildRequires: libcmocka-devel >= 1.0.1 BuildRequires: librdmacm-devel >= 1.0.15 @@ -28,14 +25,13 @@ Obsoletes: %{name}-common < %{version}-%{release} Obsoletes: %{name}-core < %{version}-%{release} Provides: %{name}-common = %{version}-%{release} Provides: %{name}-core = %{version}-%{release} -Requires: python2-gluster = %{version}-%{release} -Requires: python2 python2-prettytable python-requests attr psmisc rsync +Requires: python3-gluster = %{version}-%{release} +Requires: python3 python3-prettytable python3-requests attr psmisc rsync Requires: rpcbind pyxattr lvm2 nfs-utils Requires(pre): shadow-utils -Requires(post): systemd +Requires(post): systemd /sbin/ldconfig Requires(preun): systemd -Requires(postun): systemd - +Requires(postun): systemd /sbin/ldconfig Provides: %{name}-api Obsoletes: %{name}-api @@ -61,6 +57,10 @@ Provides: %{name}-rdma Obsoletes: %{name}-rdma Provides: %{name}-server Obsoletes: %{name}-server +Provides: %{name}-cloudsync-plugins +Obsoletes: %{name}-cloudsync-plugins +Provides: %{name}-thin-arbiter +Obsoletes: %{name}-thin-arbiter %description GlusterFS is a scalable network filesystem suitable for data-intensive tasks such as cloud storage @@ -77,21 +77,11 @@ Requires: libacl-devel %description devel This package provides the development libraries and include files. -%package -n python-gluster +%package -n python3-gluster Summary: GlusterFS python library -BuildArch: noarch +Requires: python3 -%description -n python-gluster -This package contains the python modules of GlusterFS and own gluster namespace. - -%package -n python2-gluster -Summary: GlusterFS python library -%{?python_provide:%python_provide python2-gluster} -Provides: python-gluster = %{version}-%{release} -Obsoletes: python-gluster < 3.10 -Requires: python2 - -%description -n python2-gluster +%description -n python3-gluster This package contains the python2 modules of GlusterFS and own gluster namespace. %package help @@ -138,7 +128,6 @@ make install DESTDIR=%{buildroot} docdir="%_docdir/%name" %delete_la_and_a -install -p -m 0644 contrib/uuid/*.h %{buildroot}%{_includedir}/glusterfs/ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/glusterd install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/glusterfsd mkdir -p %{buildroot}%{_localstatedir}/log/{glusterd,glusterfs,glusterfsd} @@ -262,8 +251,14 @@ if [ $1 -ge 1 ]; then %systemd_postun_with_restart glusterd fi -exit 0 +if [ $1 -eq 0 ]; then + if [ -f %{_unitdir}/gluster-ta-volume.service ]; then + /bin/systemctl --quiet stop gluster-ta-volume + %systemd_preun gluster-ta-volume + fi +fi +exit 0 %postun /sbin/ldconfig @@ -271,7 +266,6 @@ exit 0 %firewalld_reload exit 0 - %files %license COPYING-GPLV2 COPYING-LGPLV3 %doc extras/clear_xattrs.sh @@ -289,11 +283,7 @@ exit 0 %dir %{_libdir}/glusterfs/%{version}/xlator %dir %{_libdir}/glusterfs/%{version}/xlator/debug %{_libdir}/glusterfs/%{version}/xlator/debug/* -%dir %{_libdir}/glusterfs/%{version}/xlator/encryption - %{_libdir}/glusterfs/%{version}/xlator/encryption/* %dir %{_libdir}/glusterfs/%{version}/xlator/features - %{_libdir}/glusterfs/%{version}/xlator/features/posix* - %{_libdir}/glusterfs/%{version}/xlator/features/quota* %{_libdir}/glusterfs/%{version}/xlator/features/*.so %{_libdir}/glusterfs/%{version}/xlator/meta.so %dir %{_libdir}/glusterfs/%{version}/xlator/performance @@ -304,32 +294,34 @@ exit 0 %dir %attr(0775,gluster,gluster) %{_rundir}/gluster/metrics %{_tmpfilesdir}/gluster.conf %exclude %{_libdir}/*.so +%{_libdir}/libgfapi.* %dir %{_libdir}/glusterfs/%{version}/xlator/mount %{_libdir}/glusterfs/%{version}/xlator/mount/*.so %{_sbindir}/gluster %{_sysconfdir}/bash_completion.d/gluster %dir %{_libdir}/glusterfs/%{version}/xlator/cluster %{_libdir}/glusterfs/%{version}/xlator/cluster/*.so -%dir %{_libdir}/glusterfs/%{version}/xlator/testing -%dir %{_libdir}/glusterfs/%{version}/xlator/testing/features - %{_libdir}/glusterfs/%{version}/xlator/testing/features/template.so -%dir %{_libdir}/glusterfs/%{version}/xlator/testing/performance - %{_libdir}/glusterfs/%{version}/xlator/testing/performance/symlink-cache.so -# Glupy Python files -%dir %{python2_sitelib}/gluster -%dir %{python2_sitelib}/gluster/glupy - %{python2_sitelib}/gluster/glupy/* - %{_sbindir}/glusterfs - %{_sbindir}/glusterfsd - %{_bindir}/fusermount-glusterfs - /sbin/mount.glusterfs +%dir %{_libdir}/glusterfs/%{version}/cloudsync-plugins + %{_libdir}/glusterfs/%{version}/cloudsync-plugins/cloudsyncs3.so + %{_libdir}/glusterfs/%{version}/cloudsync-plugins/cloudsynccvlt.so +%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground + %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground/template.so + +# files fuse +%{_sbindir}/glusterfs +%{_sbindir}/glusterfsd +%{_bindir}/fusermount-glusterfs +/sbin/mount.glusterfs %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs + +# file gnfs %dir %{_libdir}/glusterfs/%{version}/xlator/nfs %{_libdir}/glusterfs/%{version}/xlator/nfs/* %ghost %dir %attr(0755,-,-) %{_localstatedir}/lib/glusterd/nfs %ghost %attr(0600,-,-) %{_localstatedir}/lib/glusterd/nfs/nfs-server.vol %ghost %dir %attr(0755,-,-) %{_localstatedir}/lib/glusterd/nfs/run %ghost %attr(0600,-,-) %{_localstatedir}/lib/glusterd/nfs/run/nfs.pid + %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-georep %{_sbindir}/gfind_missing_files %{_sbindir}/gluster-mountbroker @@ -337,8 +329,8 @@ exit 0 %dir %{_libexecdir}/glusterfs/python %dir %{_libexecdir}/glusterfs/python/syncdaemon %{_libexecdir}/glusterfs/python/syncdaemon/* -%dir %{_libexecdir}/glusterfs/events - %{_libexecdir}/glusterfs/events/* +%dir %{_libexecdir}/glusterfs/gfevents + %{_libexecdir}/glusterfs/gfevents/* %{_libexecdir}/glusterfs/gsyncd %{_libexecdir}/glusterfs/gverify.sh %{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh @@ -347,7 +339,7 @@ exit 0 %{_libexecdir}/glusterfs/peer_mountbroker.py* %{_libexecdir}/glusterfs/gfind_missing_files %{_libexecdir}/glusterfs/peer_georep-sshkey.py* - %{_libexecdir}/glusterfs/mount-shared-storage.sh + %{_libexecdir}/glusterfs/mount-shared-storage.sh %{_libexecdir}/glusterfs/glusterfind %{_libexecdir}/glusterfs/peer_add_secret_pub %{_libexecdir}/glusterfs/peer_eventsapi.py* @@ -368,21 +360,18 @@ exit 0 %{_unitdir}/glusterd.service %{_unitdir}/glusterfsd.service %{_unitdir}/glusterfssharedstorage.service - +%{_unitdir}/gluster-ta-volume.service # binaries %{_sbindir}/glusterd %{_sbindir}/glfsheal %{_sbindir}/gf_attach %{_sbindir}/gluster-setgfid2path -%{_libdir}/libgfdb.so.* %dir %{_libdir}/glusterfs/%{version}/xlator/mgmt %{_libdir}/glusterfs/%{version}/xlator/mgmt/*.so %dir %{_libdir}/glusterfs/%{version}/xlator/protocol %{_libdir}/glusterfs/%{version}/xlator/protocol/*.so %dir %{_libdir}/glusterfs/%{version}/xlator/storage - %{_libdir}/glusterfs/%{version}/xlator/storage/bd.so -%exclude %{_prefix}/lib/debug%{_libdir}/glusterfs/%{version}/xlator/storage/bd.so*debug %{_libdir}/glusterfs/%{version}/xlator/storage/posix.so # snap_scheduler %{_sbindir}/snap_scheduler.py @@ -443,28 +432,23 @@ exit 0 %ghost %dir %attr(0755,-,-) %{_localstatedir}/lib/glusterd/vols %{_bindir}/glusterfind %{_prefix}/lib/firewalld/services/glusterfs.xml - %config(noreplace) %{_sysconfdir}/glusterfs/eventsconfig.json %dir %{_localstatedir}/lib/glusterd/events %{_sbindir}/glustereventsd %{_sbindir}/gluster-eventsapi %{_unitdir}/glustereventsd.service -%files -n python2-gluster -%dir %{python2_sitelib}/gluster - %{python2_sitelib}/gluster/__init__.* - %{python2_sitelib}/gluster/cliutils +%files -n python3-gluster +%dir %{python3_sitelib}/gluster + %{python3_sitelib}/gluster/__init__.* + %{python3_sitelib}/gluster/__pycache__ + %{python3_sitelib}/gluster/cliutils %files devel %dir %{_includedir}/glusterfs %{_includedir}/glusterfs/* %{_libdir}/*.so %dir %{_libdir}/glusterfs/%{version}/xlator/features -%dir %{_libdir}/glusterfs/%{version}/xlator/features/glupy - %{_libdir}/glusterfs/%{version}/xlator/features/glupy/* - %{_libdir}/pkgconfig/*.pc - %{_libdir}/libgfapi.so -%dir %{_includedir}/glusterfs/api - %{_includedir}/glusterfs/api/* +%{_libdir}/pkgconfig/*.pc %files resource-agents %{_prefix}/lib/ocf/resource.d/glusterfs @@ -473,6 +457,12 @@ exit 0 %{_mandir}/man8/*gluster*.8* %changelog +* Sat Jan 11 2020 renxudong - 7.0-1 +- Type:Upgrade +- ID:NA +- SUG:NA +- DESC:upgrade to 7.0 + * Sat Sep 21 2019 zoujing - 4.1.5-3 - Type:enhancemnet - ID:NA @@ -481,4 +471,3 @@ exit 0 * Mon Sep 16 2019 zoujing - 4.1.5-2 - Package init - diff --git a/glusterfsd.init b/glusterfsd.init index a4b1b55..1692989 100644 --- a/glusterfsd.init +++ b/glusterfsd.init @@ -9,9 +9,9 @@ # Provides: glusterfsd # Required-Start: $local_fs $network # Required-Stop: $local_fs $network -# Should-Start: -# Should-Stop: -# Default-Start: +# Should-Start: +# Should-Stop: +# Default-Start: # Default-Stop: 0 1 2 3 4 5 6 # Short-Description: glusterfs server # Description: Clustered file-system server @@ -72,7 +72,6 @@ rh_status_q() { rh_status &>/dev/null } - case "$1" in start) rh_status_q && exit 0 diff --git a/glusterfsd.service b/glusterfsd.service index e25405d..f1fba6f 100644 --- a/glusterfsd.service +++ b/glusterfsd.service @@ -14,3 +14,4 @@ ExecReload=/bin/sh -c "/bin/killall -HUP glusterfsd || /bin/true" [Install] WantedBy=multi-user.target + diff --git a/load-fuse-modules b/load-fuse-modules deleted file mode 100644 index ee194db..0000000 --- a/load-fuse-modules +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# fusermount-glusterfs requires the /dev/fuse character device. The fuse module -# provides this and is loaded on demand in newer Linux distributions. -# - -[ -c /dev/fuse ] || /sbin/modprobe fuse diff --git a/python.patch b/python.patch deleted file mode 100644 index b8d8730..0000000 --- a/python.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-c.py.orig 2018-07-11 09:40:35.166390285 -0400 -+++ glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-c.py 2018-07-11 09:41:00.743390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import os - import sys ---- glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-h.py.orig 2018-07-11 09:40:49.035390285 -0400 -+++ glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-h.py 2018-07-11 09:41:06.015390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import os - import sys ---- glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-c.py.orig 2018-07-11 09:41:30.646390285 -0400 -+++ glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-c.py 2018-07-11 09:41:53.033390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - from __future__ import print_function - import os ---- glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-h.py.orig 2018-07-11 09:41:38.198390285 -0400 -+++ glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-h.py 2018-07-11 09:41:55.423390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - from __future__ import print_function - import os