From eb37aa2bbab5a72082b989829ae7f13377230398 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 9 Jan 2019 11:17:34 -0700
Subject: [PATCH] Kill monitoring scripts by process group to ensure a full
 shutdown

---
 net/net.sh                | 6 +++++-
 net/remote/remote-node.sh | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/net.sh b/net/net.sh
index fec1269439..835aa5497c 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -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
     "
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 88f210af33..7f7826d06e 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -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