C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed cleanup-docker-orphans.sh to use docker-containerd-shim and containerd-shim (#4418)

Browse source
This commit is contained in:
Gautam Divgi 2019-04-02 11:11:21 -05:00 committed by Kubernetes Prow Robot
parent 4fe2aa6bf7
commit a8dd69cf17
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
roles/container-engine/docker/files/cleanup-docker-orphans.sh
View file

@ -9,12 +9,17 @@ list_descendants ()
[[ -n "$children" ]] && echo "$children" [[ -n "$children" ]] && echo "$children"
} }
count_shim_processes=$(pgrep -f ^docker-containerd-shim | wc -l) shim_search="^docker-containerd-shim"
count_shim_processes=$(pgrep -f $shim_search | wc -l)
if [ ${count_shim_processes} -eq 0 ]; then
shim_search="^containerd-shim"
count_shim_processes=$(pgrep -f $shim_search | wc -l)
fi
if [ ${count_shim_processes} -gt 0 ]; then if [ ${count_shim_processes} -gt 0 ]; then
# Find all container pids from shims # Find all container pids from shims
orphans=$(pgrep -P $(pgrep -d ',' -f ^docker-containerd-shim) |\ orphans=$(pgrep -P $(pgrep -d ',' -f $shim_search) |\
# Filter out valid docker pids, leaving the orphans # Filter out valid docker pids, leaving the orphans
egrep -v $(docker ps -q | xargs docker inspect --format '{{.State.Pid}}' | awk '{printf "%s%s",sep,$1; sep="|"}')) egrep -v $(docker ps -q | xargs docker inspect --format '{{.State.Pid}}' | awk '{printf "%s%s",sep,$1; sep="|"}'))