Kill monitoring scripts by process group to ensure a full shutdown

This commit is contained in:
Michael Vines 2019-01-09 11:17:34 -07:00
parent 048fe371aa
commit eb37aa2bba
2 changed files with 7 additions and 1 deletions

View File

@ -450,7 +450,11 @@ stopNode() {
sudo snap set solana mode=
fi
! tmux list-sessions || tmux kill-session
for pattern in solana- remote- oom-monitor net-stats; do
for pid in solana/{net-stats,oom-monitor}.pid; do
pgid=\$(ps opgid= \$(cat \$pid) | tr -d '[:space:]')
sudo kill -- -\$pgid
done
for pattern in solana- remote-; do
pkill -9 \$pattern
done
"

View File

@ -139,7 +139,9 @@ local|tar)
(
sudo scripts/oom-monitor.sh
) > oom-monitor.log 2>&1 &
echo $! > oom-monitor.pid
scripts/net-stats.sh > net-stats.log 2>&1 &
echo $! > net-stats.pid
maybeNoLeaderRotation=
if ! $leaderRotation; then