From 1ad989559f73be34d180122609882273c1ad9f6a Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Fri, 28 Oct 2016 12:55:08 +0800 Subject: [PATCH] Clean up the constants in 'libcontainerd' that are no longer in use Signed-off-by: Yanqiang Miao update Signed-off-by: Yanqiang Miao --- libcontainerd/remote_linux.go | 1 - libcontainerd/types.go | 16 +++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go index 8dc1f74160..e10e813aba 100644 --- a/libcontainerd/remote_linux.go +++ b/libcontainerd/remote_linux.go @@ -32,7 +32,6 @@ import ( const ( maxConnectionRetryCount = 3 - connectionRetryDelay = 3 * time.Second containerdHealthCheckTimeout = 3 * time.Second containerdShutdownTimeout = 15 * time.Second containerdBinary = "docker-containerd" diff --git a/libcontainerd/types.go b/libcontainerd/types.go index e2d3df6e7a..b1d02d8df2 100644 --- a/libcontainerd/types.go +++ b/libcontainerd/types.go @@ -9,15 +9,13 @@ import ( // State constants used in state change reporting. const ( - StateStart = "start-container" - StatePause = "pause" - StateResume = "resume" - StateExit = "exit" - StateRestore = "restore" - StateStartProcess = "start-process" - StateExitProcess = "exit-process" - StateOOM = "oom" // fake state - stateLive = "live" + StateStart = "start-container" + StatePause = "pause" + StateResume = "resume" + StateExit = "exit" + StateRestore = "restore" + StateExitProcess = "exit-process" + StateOOM = "oom" // fake state ) // CommonStateInfo contains the state info common to all platforms.