shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

M #~: Don't kill with SIGABRT but SIGTERM (#4391)

Browse Source
This commit is contained in:
Jan Orel 2020-03-20 15:59:39 +01:00 committed by GitHub
parent dfcb513178
commit 91b2263aba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/im_mad/remotes/common.d/monitord-client-shepherd.sh
View File

@ -22,7 +22,7 @@ running_pid=$(cat /tmp/one-monitord-client.pid)
pids=$(ps axuwww | grep -e /monitord-client.rb| grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids
kill $pids
fi
) > /dev/null

4
src/im_mad/remotes/common.d/monitord-client-shepherd_local.sh
View File

@ -31,13 +31,13 @@ pids=$(ps axuwww | grep -e "/monitord-client.rb.*${HID} " | grep -v grep | \
awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids
kill $pids
fi
oned=`ps auxwww | grep oned | grep -v grep | wc -l`
if [ ${oned} -eq 0 ]; then
kill -6 ${running_pid}
kill ${running_pid}
fi
) > /dev/null

2
src/im_mad/remotes/dummy.d/monitord-client_control.sh
View File

@ -61,7 +61,7 @@ function stop_client() {
local pids=$(ps axuww | grep "$CLIENT $ARGV" | grep -v grep | awk '{print $2}')
if [ -n "$pids" ]; then
kill -6 $pids
kill $pids
fi
rm -f $CLIENT_PID_FILE

2
src/im_mad/remotes/kvm-probes.d/host/beacon/monitord-client-shepherd.sh
View File

@ -22,7 +22,7 @@ running_pid=$(cat /tmp/one-monitord-client.pid)
pids=$(ps axuwww | grep -e "/monitord-client.rb kvm" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids
kill $pids
fi
) > /dev/null

2
src/im_mad/remotes/lxd-probes.d/host/beacon/monitord-client-shepherd.sh
View File

@ -22,7 +22,7 @@ running_pid=$(cat /tmp/one-monitord-client.pid)
pids=$(ps axuwww | grep -e "/monitord-client.rb lxd" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids
kill $pids
fi
) > /dev/null