Prechádzať zdrojové kódy

daemon: stop health checks before deleting task

Prevent new health check probes from racing the task deletion. This may
have been a root cause of containers taking so long to stop on Windows.

Signed-off-by: Cory Snider <csnider@mirantis.com>
Cory Snider 2 rokov pred
rodič
commit
8b748bd326
1 zmenil súbory, kde vykonal 5 pridanie a 3 odobranie
  1. 5 3
      daemon/monitor.go

+ 5 - 3
daemon/monitor.go

@@ -28,6 +28,11 @@ func (daemon *Daemon) setStateCounter(c *container.Container) {
 func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontainerdtypes.EventInfo) error {
 	var exitStatus container.ExitStatus
 	c.Lock()
+
+	// Health checks will be automatically restarted if/when the
+	// container is started again.
+	daemon.stopHealthchecks(c)
+
 	tsk, ok := c.Task()
 	if ok {
 		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
@@ -72,9 +77,6 @@ func (daemon *Daemon) handleContainerExit(c *container.Container, e *libcontaine
 		restart = false
 	}
 
-	// cancel healthcheck here, they will be automatically
-	// restarted if/when the container is started again
-	daemon.stopHealthchecks(c)
 	attributes := map[string]string{
 		"exitCode": strconv.Itoa(exitStatus.ExitCode),
 	}