@@ -247,6 +247,14 @@ func (s *State) IsPaused() bool {

 	return res

 }

+// IsRestarting returns whether the container is restarting or not.

+func (s *State) IsRestarting() bool {

+	s.Lock()

+	res := s.Restarting

+	s.Unlock()

+	return res

+}

+

 // SetRemovalInProgress sets the container state as being removed.

 func (s *State) SetRemovalInProgress() error {

 	s.Lock()

@@ -52,6 +52,9 @@ func (d *Daemon) getExecConfig(name string) (*exec.Config, error) {

 			if container.IsPaused() {

 				return nil, derr.ErrorCodeExecPaused.WithArgs(container.ID)

 			}

+			if container.IsRestarting() {

+				return nil, derr.ErrorCodeExecRestarting.WithArgs(container.ID)

+			}

 			return ec, nil

 		}

 	}

@@ -76,6 +79,9 @@ func (d *Daemon) getActiveContainer(name string) (*container.Container, error) {

 	if container.IsPaused() {

 		return nil, derr.ErrorCodeExecPaused.WithArgs(name)

 	}

+	if container.IsRestarting() {

+		return nil, derr.ErrorCodeExecRestarting.WithArgs(name)

+	}

 	return container, nil

 }

@@ -733,6 +733,15 @@ var (

 		HTTPStatusCode: http.StatusConflict,

 	})

+	// ErrorCodeExecRestarting is generated when we try to start an exec

+	// but the container is restarting.

+	ErrorCodeExecRestarting = errcode.Register(errGroup, errcode.ErrorDescriptor{

+		Value:          "EXECRESTARTING",

+		Message:        "Container %s is restarting, wait until the container is running",

+		Description:    "An attempt to start an 'exec' was made, but the owning container is restarting",

+		HTTPStatusCode: http.StatusConflict,

+	})

+

 	// ErrorCodeExecRunning is generated when we try to start an exec

 	// but its already running.

 	ErrorCodeExecRunning = errcode.Register(errGroup, errcode.ErrorDescriptor{