summaryrefslogtreecommitdiffstats
path: root/glusterfs.spec.in
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2014-06-27 07:04:47 -0400
committerNiels de Vos <ndevos@redhat.com>2014-07-02 03:31:19 -0700
commitcc372dc0d0561b2995d89cab4e84dcebef0c346c (patch)
treec8fc1eaa1abd7f112857532a8c632f5b56c704e7 /glusterfs.spec.in
parentcacc1311626aa8b2dfe9f937cf1b14bb534a8937 (diff)
build/glusterfs.spec.in: %post server doesn't wait for old glusterd
'killall glusterd' needs to wait for the old glusterd to exi before starting the updated one, otherwise the new process can't bind to its socket ports Change-Id: I78af70419d8b1ac878ee9711acdc01b308b0e46f BUG: 1113959 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/8190 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Diffstat (limited to 'glusterfs.spec.in')
-rw-r--r--glusterfs.spec.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 8baddb1b306..ad87ea5a674 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -938,7 +938,7 @@ pidof -c -o %PPID -x glusterd &> /dev/null
if [ $? -eq 0 ]; then
kill -9 `pgrep -f gsyncd.py` &> /dev/null
- killall glusterd &> /dev/null
+ killall --wait glusterd &> /dev/null
glusterd --xlator-option *.upgrade=on -N
else
glusterd --xlator-option *.upgrade=on -N
@@ -963,6 +963,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
+- killall --wait in %%post server (#1113959, #1113745)
+
* Thu May 22 2014 Niels de Vos <ndevos@redhat.com>
- Almost drop calling ./autogen.sh