summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2014-02-06 17:16:20 +0530
committerVijay Bellur <vbellur@redhat.com>2014-02-10 16:34:02 -0800
commitd4e7dd1d2fe2a76318ddd0a7200a9d4fa51dbaf7 (patch)
treee9551d3ec08b3e3c58d08a628fcda913e86ea522
parentc1c3ab9e4c96e059ba1abc1a0b5ba221ef6e3d8d (diff)
spec: geo-rep: Include hooks and upgrade scripts
Added hook script S56glusterd-geo-rep-create-post.sh to %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/ and upgrade scripts added to %{_datadir}/glusterfs/scripts/ BUG: 1036539 Change-Id: Id114b827824e55516181ab8f564d419c258be3e2 Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/6926 Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--extras/geo-rep/Makefile.am9
-rw-r--r--glusterfs.spec.in21
2 files changed, 30 insertions, 0 deletions
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am
index fc5f56d54..9435861cf 100644
--- a/extras/geo-rep/Makefile.am
+++ b/extras/geo-rep/Makefile.am
@@ -1,2 +1,11 @@
+scriptsdir = $(datadir)/glusterfs/scripts
+scripts_DATA = gsync-upgrade.sh generate-gfid-file.sh get-gfid.sh \
+ slave-upgrade.sh
+
+scripts_PROGRAMS = gsync-sync-gfid
+gsync_sync_gfid_CFLAGS = $(GF_CFLAGS) -Wall -I$(top_srcdir)/libglusterfs/src
+gsync_sync_gfid_LDADD = $(GF_LIBS) $(top_builddir)/libglusterfs/src/libglusterfs.la
+gsync_sync_gfid_SOURCES = gsync-sync-gfid.c
+
EXTRA_DIST = gsync-sync-gfid.c gsync-upgrade.sh generate-gfid-file.sh \
get-gfid.sh slave-upgrade.sh
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index c855c8423..275d65b4d 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -154,6 +154,9 @@ BuildRequires: lvm2-devel
%if ( 0%{!?_without_qemu_block:1} )
BuildRequires: glib2-devel
%endif
+%if ( 0%{!?_without_georeplication:1} )
+BuildRequires: libattr-devel
+%endif
Obsoletes: hekafs
Obsoletes: %{name}-common < %{version}-%{release}
@@ -609,6 +612,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run
touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol
touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
+install -p -m 0744 extras/hook-scripts/S56glusterd-geo-rep-create-post.sh \
+ %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post
+
find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs
%clean
@@ -689,15 +695,27 @@ if [ $1 -ge 1 ]; then
fi
%files geo-replication
+%{_sysconfdir}/logrotate.d/glusterfs-georep
%{_libexecdir}/glusterfs/gsyncd
%{_libexecdir}/glusterfs/python/syncdaemon/*
%{_libexecdir}/glusterfs/gverify.sh
%{_libexecdir}/glusterfs/peer_add_secret_pub
%{_libexecdir}/glusterfs/peer_gsec_create
%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
+%{_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
%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
%endif
+
%files fuse
%if ( 0%{_for_fedora_koji_builds} )
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse
@@ -872,6 +890,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Thu Feb 06 2014 Aravinda VK <avishwan@redhat.com>
+- Include geo-replication upgrade scripts and hook scripts.
+
* Wed Jan 15 2014 Niels de Vos <ndevos@redhat.com>
- Install /var/lib/glusterd/groups/virt by default