From 02da3e48f6f49103a4c580d1c6c4a275311a0e87 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 17 Nov 2020 22:23:39 -0800 Subject: [PATCH] package/docker-engine: increase containerd startup timeout period Signed-off-by: Christian Stewart --- ...crease-timeouts-for-containerd-start.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch diff --git a/package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch b/package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch new file mode 100644 index 00000000000..c533e2e15e9 --- /dev/null +++ b/package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch @@ -0,0 +1,35 @@ +From 5cb345e7ccb53290681c060cdf0d75a244a4ccb3 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Tue, 17 Nov 2020 22:21:33 -0800 +Subject: [PATCH] libcontainerd: increase timeouts for containerd startup + +Fixes startup error "timeout waiting for containerd to start" on some systems +with slow I/O. + +Signed-off-by: Christian Stewart +--- + libcontainerd/supervisor/remote_daemon.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go +index 3538612246..7dfdbdbe0e 100644 +--- a/libcontainerd/supervisor/remote_daemon.go ++++ b/libcontainerd/supervisor/remote_daemon.go +@@ -22,10 +22,10 @@ import ( + ) + + const ( +- maxConnectionRetryCount = 3 +- healthCheckTimeout = 3 * time.Second +- shutdownTimeout = 15 * time.Second +- startupTimeout = 15 * time.Second ++ maxConnectionRetryCount = 4 ++ healthCheckTimeout = 6 * time.Second ++ shutdownTimeout = 30 * time.Second ++ startupTimeout = 120 * time.Second + configFile = "containerd.toml" + binaryName = "containerd" + pidFile = "containerd.pid" +-- +2.29.2 +