浏览代码

Merge pull request #46764 from cpuguy83/fix_probe_interval

Fix case where health start interval is 0 uses default
Sebastiaan van Stijn 1 年之前
父节点
当前提交
5baf486545
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      daemon/health.go

+ 1 - 1
daemon/health.go

@@ -248,7 +248,7 @@ func handleProbeResult(d *Daemon, c *container.Container, result *types.Healthch
 // There is never more than one monitor thread running per container at a time.
 func monitor(d *Daemon, c *container.Container, stop chan struct{}, probe probe) {
 	probeInterval := timeoutWithDefault(c.Config.Healthcheck.Interval, defaultProbeInterval)
-	startInterval := timeoutWithDefault(c.Config.Healthcheck.StartInterval, defaultProbeInterval)
+	startInterval := timeoutWithDefault(c.Config.Healthcheck.StartInterval, probeInterval)
 	startPeriod := timeoutWithDefault(c.Config.Healthcheck.StartPeriod, defaultStartPeriod)
 
 	c.Lock()