From 2c63ac3a974a7ab56ffeddece76cc29710ef2996 Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Wed, 3 Feb 2016 11:08:27 +0800 Subject: [PATCH] Fix error message for pause a restarting container Signed-off-by: Zhang Wei --- daemon/pause.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/pause.go b/daemon/pause.go index bcf2280e80..7220dbef24 100644 --- a/daemon/pause.go +++ b/daemon/pause.go @@ -35,6 +35,11 @@ func (daemon *Daemon) containerPause(container *container.Container) error { return derr.ErrorCodeAlreadyPaused.WithArgs(container.ID) } + // We cannot Pause the container which is restarting + if container.Restarting { + return derr.ErrorCodeContainerRestarting.WithArgs(container.ID) + } + if err := daemon.execDriver.Pause(container.Command); err != nil { return err }