kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

entrypoint: Retry fix_cgroup on failure

pull/8974/head
Thomas Stromberg 2020-08-11 13:44:22 -07:00
parent 5ed6c988ec
commit 4265facd96
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
deploy/kicbase/entrypoint
View File

@ -65,7 +65,7 @@ fix_mount() {
mount --make-rshared / mount --make-rshared /
} }
fix_cgroup() { fix_cgroup_mounts() {
echo 'INFO: fix cgroup mounts for all subsystems' echo 'INFO: fix cgroup mounts for all subsystems'
# For each cgroup subsystem, Docker does a bind mount from the current # For each cgroup subsystem, Docker does a bind mount from the current
# cgroup to the root of the cgroup subsystem. For instance: # cgroup to the root of the cgroup subsystem. For instance:
@ -78,30 +78,38 @@ fix_cgroup() {
# This is because `/proc/<pid>/cgroup` is not affected by the bind mount. # This is because `/proc/<pid>/cgroup` is not affected by the bind mount.
# The following is a workaround to recreate the original cgroup # The following is a workaround to recreate the original cgroup
# environment by doing another bind mount for each subsystem. # environment by doing another bind mount for each subsystem.
local docker_cgroup_mounts local cgroup_mounts
docker_cgroup_mounts=$(grep /sys/fs/cgroup /proc/self/mountinfo | grep docker || true)
if [[ -n "${docker_cgroup_mounts}" ]]; then # NOTE: This extracts fields 4 and on
local docker_cgroup cgroup_subsystems subsystem # See https://man7.org/linux/man-pages/man5/proc.5.html for field names
docker_cgroup=$(echo "${docker_cgroup_mounts}" | head -n 1 | cut -d' ' -f 4) cgroup_mounts=$(egrep -o '(/docker|libpod_parent).*/sys/fs/cgroup.*' /proc/self/mountinfo || true)
cgroup_subsystems=$(echo "${docker_cgroup_mounts}" | cut -d' ' -f 5)
echo "${cgroup_subsystems}" | if [[ -n "${cgroup_mounts}" ]]; then
while IFS= read -r subsystem; do local mount_root
mkdir -p "${subsystem}${docker_cgroup}" mount_root=$(echo "${cgroup_mounts}" | head -n 1 | cut -d' ' -f1)
mount --bind "${subsystem}" "${subsystem}${docker_cgroup}"
for mount_point in $(echo "${cgroup_mounts}" | cut -d' ' -f 2); do
# bind mount each mount_point to mount_point + mount_root
# mount --bind /sys/fs/cgroup/cpu /sys/fs/cgroup/cpu/docker/fb07bb6daf7730a3cb14fc7ff3e345d1e47423756ce54409e66e01911bab2160
local target="${mount_point}${mount_root}"
if ! findmnt "${target}"; then
mkdir -p "${target}"
mount --bind "${mount_point}" "${target}"
fi
done done
fi fi
local podman_cgroup_mounts }
podman_cgroup_mounts=$(grep /sys/fs/cgroup /proc/self/mountinfo | grep libpod_parent || true)
if [[ -n "${podman_cgroup_mounts}" ]]; then retryable_fix_cgroup_mounts() {
local podman_cgroup cgroup_subsystems subsystem for i in $(seq 0 10); do
podman_cgroup=$(echo "${podman_cgroup_mounts}" | head -n 1 | cut -d' ' -f 4) fix_cgroup_mounts && return || echo "fix_cgroup failed with exit code $? (retry $i)"
cgroup_subsystems=$(echo "${podman_cgroup_mounts}" | cut -d' ' -f 5) echo "fix_cgroup diagnostics information below:"
echo "${cgroup_subsystems}" | mount
while IFS= read -r subsystem; do sleep 1
mkdir -p "${subsystem}${podman_cgroup}"
mount --bind "${subsystem}" "${subsystem}${podman_cgroup}"
done done
fi
exit 31
} }
fix_machine_id() { fix_machine_id() {
@ -256,7 +264,7 @@ enable_network_magic(){
select_iptables select_iptables
fix_kmsg fix_kmsg
fix_mount fix_mount
fix_cgroup retryable_fix_cgroup_mounts
fix_machine_id fix_machine_id
fix_product_name fix_product_name
fix_product_uuid fix_product_uuid