summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2014-06-26 17:14:39 -0400
committerVijay Bellur <vbellur@redhat.com>2014-07-02 01:39:30 -0700
commit858b570a0c62d31416f0aee8c385b3118a1fad43 (patch)
tree2cba8bfa391c5f5d88bc201fda534465bf1a79d3
parent4e74cbf1da39f8244b5f732b314aab91495b4e29 (diff)
build/glusterfs.spec.in: %post server doesn't wait for old glusterd
'killall glusterd' needs to wait for the old glusterd to exit before starting the updated one, otherwise the new process can't bind to its socket ports Change-Id: Ib43c76f232e0ea6f7f8469fb12be7f2b907fb7c8 BUG: 1113543 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/8185 Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--glusterfs.spec.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 068df0eeff5..007df1abee5 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -775,7 +775,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
@@ -1033,6 +1033,9 @@ fi
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%changelog
+* Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
+- killall --wait in %%post server, (#1113543)
+
* Thu Jun 12 2014 Varun Shastry <vshastry@redhat.com>
- Add bash completion config to the cli package