New: a prototype vzmaster kill

nponeccop · Apr 9, 2016 · b5eae0b · b5eae0b · nponeccop · Apr 9, 2016
1 parent d77e0de
commit b5eae0b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/vzmaster/kill.sh b/vzmaster/kill.sh
@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
 set -ex -o pipefail
-pgid=$(ps -o pgid= $(cat /run/opencontainer/chroots/$1/state.json | jshon -e init_process_pid -u) | awk '{print $1}')
-
+container_id=$1
+pid=$(cat /run/opencontainer/chroots/$container_id/state.json | jshon -e init_process_pid -u)
+pgid=$(ps -o pgid="" $pid | awk '{print $1}')
 sudo kill -- -$pgid
+
+echo waiting for $pid to exit
+while [ -d /proc/$pid ] ; do sleep 1; done
+echo process $pid exited
+$(dirname $0)/runch delete $container_id
diff --git a/vzmaster/vzmaster-kill.yaml b/vzmaster/vzmaster-kill.yaml
@@ -1,4 +1,5 @@
 ---
 - hosts: all
   tasks:
-  - command: "{{ vzexec.path }}/bin/runch kill {{ vzexec.container_id }}"
+  - copy: src=kill.sh dest={{ vzexec.path }}/bin/kill mode=755
+  - command: "{{ vzexec.path }}/bin/kill {{ vzexec.container_id }}"