100 lines
2.9 KiB
Diff
100 lines
2.9 KiB
Diff
|
From 8a3035bf612943694a3cd1c6a857bd009e84f55d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Milind Changire <mchangir@redhat.com>
|
||
|
|
Date: Tue, 10 Oct 2017 09:58:24 +0530
|
||
|
|
Subject: [PATCH 19/52] build: launch glusterd upgrade after all new bits are
|
||
|
|
installed
|
||
|
|
|
||
|
|
Problem:
|
||
|
|
glusterd upgrade mode needs new bits from glusterfs-rdma which
|
||
|
|
optional and causes the dependency graph to break since it is
|
||
|
|
not tied into glusterfs-server requirements
|
||
|
|
|
||
|
|
Solution:
|
||
|
|
Run glusterd upgrade mode after all new bits are installed
|
||
|
|
i.e. in %posttrans server section
|
||
|
|
|
||
|
|
Label: DOWNSTREAM ONLY
|
||
|
|
|
||
|
|
Change-Id: I356e02d0bf0eaaef43c20ce07b388262f63093a4
|
||
|
|
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
||
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/120094
|
||
|
|
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
||
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||
|
|
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
|
||
|
|
---
|
||
|
|
glusterfs.spec.in | 51 +++++++++++++++++++++++++++++----------------------
|
||
|
|
1 file changed, 29 insertions(+), 22 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
||
|
|
index 3a98822..208a82d 100644
|
||
|
|
--- a/glusterfs.spec.in
|
||
|
|
+++ b/glusterfs.spec.in
|
||
|
|
@@ -946,28 +946,6 @@ fi
|
||
|
|
%firewalld_reload
|
||
|
|
%endif
|
||
|
|
|
||
|
|
-pidof -c -o %PPID -x glusterd &> /dev/null
|
||
|
|
-if [ $? -eq 0 ]; then
|
||
|
|
- kill -9 `pgrep -f gsyncd.py` &> /dev/null
|
||
|
|
-
|
||
|
|
- killall --wait glusterd &> /dev/null
|
||
|
|
- glusterd --xlator-option *.upgrade=on -N
|
||
|
|
-
|
||
|
|
- #Cleaning leftover glusterd socket file which is created by glusterd in
|
||
|
|
- #rpm_script_t context.
|
||
|
|
- rm -f %{_rundir}/glusterd.socket
|
||
|
|
-
|
||
|
|
- # glusterd _was_ running, we killed it, it exited after *.upgrade=on,
|
||
|
|
- # so start it again
|
||
|
|
- %service_start glusterd
|
||
|
|
-else
|
||
|
|
- glusterd --xlator-option *.upgrade=on -N
|
||
|
|
-
|
||
|
|
- #Cleaning leftover glusterd socket file which is created by glusterd in
|
||
|
|
- #rpm_script_t context.
|
||
|
|
- rm -f %{_rundir}/glusterd.socket
|
||
|
|
-fi
|
||
|
|
-exit 0
|
||
|
|
%endif
|
||
|
|
|
||
|
|
##-----------------------------------------------------------------------------
|
||
|
|
@@ -2027,6 +2005,35 @@ os.remove(tmpname)
|
||
|
|
if not (ok == 0) then
|
||
|
|
error("Detected running glusterfs processes", ok)
|
||
|
|
end
|
||
|
|
+
|
||
|
|
+%posttrans server
|
||
|
|
+pidof -c -o %PPID -x glusterd &> /dev/null
|
||
|
|
+if [ $? -eq 0 ]; then
|
||
|
|
+ kill -9 `pgrep -f gsyncd.py` &> /dev/null
|
||
|
|
+
|
||
|
|
+ killall --wait -SIGTERM glusterd &> /dev/null
|
||
|
|
+
|
||
|
|
+ if [ "$?" != "0" ]; then
|
||
|
|
+ echo "killall failed while killing glusterd"
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ glusterd --xlator-option *.upgrade=on -N
|
||
|
|
+
|
||
|
|
+ #Cleaning leftover glusterd socket file which is created by glusterd in
|
||
|
|
+ #rpm_script_t context.
|
||
|
|
+ rm -rf /var/run/glusterd.socket
|
||
|
|
+
|
||
|
|
+ # glusterd _was_ running, we killed it, it exited after *.upgrade=on,
|
||
|
|
+ # so start it again
|
||
|
|
+ %service_start glusterd
|
||
|
|
+else
|
||
|
|
+ glusterd --xlator-option *.upgrade=on -N
|
||
|
|
+
|
||
|
|
+ #Cleaning leftover glusterd socket file which is created by glusterd in
|
||
|
|
+ #rpm_script_t context.
|
||
|
|
+ rm -rf /var/run/glusterd.socket
|
||
|
|
+fi
|
||
|
|
+
|
||
|
|
%endif
|
||
|
|
|
||
|
|
%changelog
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|