Merge pull request #17629 from tonistiigi/kill-autorestart-fix

Fix race causing autorestart turning off on restart
Upstream-commit: 8d5695470ae909d0abb62e10f41c6e5f342520cd
Component: engine

components/engine/daemon/container.go

@@ -503,7 +503,7 @@ func (container *Container) Stop(seconds int) error {
 		// 3. If it doesn't, then send SIGKILL
 		if err := container.Kill(); err != nil {
 			container.WaitStop(-1 * time.Second)
-			return err
+			logrus.Warn(err) // Don't return error because we only care that container is stopped, not what function stopped it
 		}
 	}