fix: Container with Notify=healthy respect HealthStartPeriod larger than TimeoutStartSec.

libpod/container_internal.go

@@ -1345,6 +1345,61 @@ func (c *Container) waitForHealthy(ctx context.Context) error {
 		defer c.lock.Lock()
 	}
 
+	healthStartPeriod := c.config.HealthCheckConfig.StartPeriod
+	needsExtension := healthStartPeriod > 0
+	var extendedTotal time.Duration
+	extension := 30 * time.Second
+	timerFreq := 25 * time.Second
+
+	if needsExtension {
+		timer := time.NewTicker(timerFreq)
+		extendCtx, cancel := context.WithCancel(ctx)
+		defer cancel()
+		defer timer.Stop()
+
+		// compute next chunk
+		sendExtend := func() {
+			remaining := healthStartPeriod - extendedTotal
+			if remaining <= 0 {
+				return
+			}
+
+			step := extension
+			if step > remaining {
+				step = remaining
+			}
+
+			// Build the EXTEND message
+			msg := fmt.Sprintf("EXTEND_TIMEOUT_USEC=%d", step.Microseconds())
+			if err := notifyproxy.SendMessage(c.config.SdNotifySocket, msg); err != nil {
+				logrus.Errorf("EXTEND_TIMEOUT_USEC failed in health-wait: %w", err)
+			} else {
+				logrus.Debugf("Extended startup by %v (total %v / %v)",
+					step, extendedTotal+step, healthStartPeriod)
+			}
+
+			extendedTotal += step
+		}
+
+		// First extension immediately
+		sendExtend()
+
+		// Background periodic extension loop
+		go func() {
+			for {
+				select {
+				case <-extendCtx.Done():
+					return
+				case <-timer.C:
+					if extendedTotal >= healthStartPeriod {
+						return
+					}
+					sendExtend()
+				}
+			}
+		}()
+	}
+
 	if _, err := c.WaitForConditionWithInterval(ctx, DefaultWaitInterval, define.HealthCheckHealthy); err != nil {
 		if errors.Is(err, define.ErrNoSuchCtr) {
 			return nil