From 8bb81586f092228d7003bd5b6ea9ea67e8d8551e Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 14 Feb 2014 09:14:10 -0500 Subject: redhat: wait longer before kill -9'ing bcfg2-server --- redhat/scripts/bcfg2-server.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redhat/scripts/bcfg2-server.init') diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init index c4412d1c3..395189e90 100755 --- a/redhat/scripts/bcfg2-server.init +++ b/redhat/scripts/bcfg2-server.init @@ -49,7 +49,7 @@ start () { stop () { echo -n $"Stopping $prog: " - killproc ${prog} && success || failure + killproc -p ${PIDFILE} -d 10 ${prog} && success || failure RETVAL=$? echo rm -f /var/lock/subsys/$prog -- cgit v1.2.3-1-g7c22 From cc22a54060c4a90b8dbd9e9d70308f1ba359bee0 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 20 Feb 2014 16:03:17 -0500 Subject: init: wait even longer for bcfg2-server to stop --- redhat/scripts/bcfg2-server.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'redhat/scripts/bcfg2-server.init') diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init index 395189e90..f74a856eb 100755 --- a/redhat/scripts/bcfg2-server.init +++ b/redhat/scripts/bcfg2-server.init @@ -49,7 +49,7 @@ start () { stop () { echo -n $"Stopping $prog: " - killproc -p ${PIDFILE} -d 10 ${prog} && success || failure + killproc -p ${PIDFILE} -d 30 ${prog} && success || failure RETVAL=$? echo rm -f /var/lock/subsys/$prog -- cgit v1.2.3-1-g7c22 From 20c1977d58bb51a1e5c6bea892ab5a422358d5ff Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 25 Feb 2014 14:12:09 -0500 Subject: redhat: fixed killproc behavior when multiprocessing core doesn't shut down properly --- redhat/scripts/bcfg2-server.init | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'redhat/scripts/bcfg2-server.init') diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init index f74a856eb..7fd1bd906 100755 --- a/redhat/scripts/bcfg2-server.init +++ b/redhat/scripts/bcfg2-server.init @@ -49,7 +49,13 @@ start () { stop () { echo -n $"Stopping $prog: " - killproc -p ${PIDFILE} -d 30 ${prog} && success || failure + # we do NOT want to specify the pidfile to killproc; if we do, and + # it has to kill -9 the server, it only kills the master and the + # child processes stay running (if the multiprocessing core is in + # use). By not specifying a pidfile, it looks in the process + # table for all bcfg2-server processes, and kill -9's them all if + # necessary. + killproc -d 30 ${prog} && success || failure RETVAL=$? echo rm -f /var/lock/subsys/$prog -- cgit v1.2.3-1-g7c22