From e067817a80ded886153538863778b8266947d849 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 30 Oct 2017 12:07:15 -0700 Subject: [PATCH] COS: Keep the docker network checkpoint This is necessary for enabling the live-restore feature. --- cluster/gce/gci/configure-helper.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 12f7b6ec770..7631504901c 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -838,23 +838,11 @@ function assemble-docker-flags { echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker - if [[ "${use_net_plugin}" == "true" ]]; then - # If using a network plugin, extend the docker configuration to always remove - # the network checkpoint to avoid corrupt checkpoints. - # (https://github.com/docker/docker/issues/18283). - echo "Extend the docker.service configuration to remove the network checkpiont" - mkdir -p /etc/systemd/system/docker.service.d - cat </etc/systemd/system/docker.service.d/01network.conf -[Service] -ExecStartPre=/bin/sh -x -c "rm -rf /var/lib/docker/network" -EOF - fi - # Ensure TasksMax is sufficient for docker. # (https://github.com/kubernetes/kubernetes/issues/51977) echo "Extend the docker.service configuration to set a higher pids limit" mkdir -p /etc/systemd/system/docker.service.d - cat </etc/systemd/system/docker.service.d/02tasksmax.conf + cat </etc/systemd/system/docker.service.d/01tasksmax.conf [Service] TasksMax=infinity EOF