Merge pull request #19245 from mheon/fix_19237

Ensure HC events fire after logs are written

libpod/container_exec.go

@@ -321,9 +321,7 @@ func (c *Container) execStartAndAttach(sessionID string, streams *define.AttachS
 		return err
 	}
 
-	if isHealthcheck {
+	if !isHealthcheck {
-		c.newContainerEvent(events.HealthStatus)
-	} else {
 		c.newContainerEvent(events.Exec)
 	}
 

libpod/healthcheck.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/containers/podman/v4/libpod/define"
+	"github.com/containers/podman/v4/libpod/events"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
@@ -60,6 +61,7 @@ func (c *Container) runHealthCheck(ctx context.Context, isStartup bool) (define.
 		returnCode    int
 		inStartPeriod bool
 	)
+
 	hcCommand := c.HealthCheckConfig().Test
 	if isStartup {
 		logrus.Debugf("Running startup healthcheck for container %s", c.ID())
@@ -167,6 +169,13 @@ func (c *Container) runHealthCheck(ctx context.Context, isStartup bool) (define.
 		return hcResult, "", fmt.Errorf("unable to update health check log %s for %s: %w", c.healthCheckLogPath(), c.ID(), err)
 	}
 
+	// Write HC event with appropriate status as the last thing before we
+	// return.
+	if hcResult == define.HealthCheckNotDefined || hcResult == define.HealthCheckInternalError {
+		return hcResult, logStatus, hcErr
+	}
+	c.newContainerEvent(events.HealthStatus)
+
 	return hcResult, logStatus, hcErr
 }
 

test/e2e/healthcheck_run_test.go

@@ -245,6 +245,16 @@ var _ = Describe("Podman healthcheck run", func() {
 		inspect = podmanTest.InspectContainer("hc")
 		Expect(inspect[0].State.Health).To(HaveField("Status", define.HealthCheckHealthy))
 
+		// Test that events generated have correct status (#19237)
+		events := podmanTest.Podman([]string{"events", "--stream=false", "--filter", "event=health_status", "--since", "1m"})
+		events.WaitWithDefaultTimeout()
+		Expect(events).Should(Exit(0))
+		eventsOut := events.OutputToStringArray()
+		Expect(eventsOut).To(HaveLen(3))
+		Expect(eventsOut[0]).To(ContainSubstring("health_status=starting"))
+		Expect(eventsOut[1]).To(ContainSubstring("health_status=unhealthy"))
+		Expect(eventsOut[2]).To(ContainSubstring("health_status=healthy"))
+
 		// Test podman ps --filter health is working (#11687)
 		ps := podmanTest.Podman([]string{"ps", "--filter", "health=healthy"})
 		ps.WaitWithDefaultTimeout()