Merge pull request #17211 from vrothberg/ps-health

ps: query health check in batch mode

libpod/healthcheck.go

@@ -407,18 +407,21 @@ func (c *Container) getHealthCheckLog() (define.HealthCheckResults, error) {
 	return healthCheck, nil
 }
 
-// HealthCheckStatus returns the current state of a container with a healthcheck
+// HealthCheckStatus returns the current state of a container with a healthcheck.
+// Returns an empty string if no health check is defined for the container.
 func (c *Container) HealthCheckStatus() (string, error) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
+	if !c.batched {
+		c.lock.Lock()
+		defer c.lock.Unlock()
+	}
 	return c.healthCheckStatus()
 }
 
 // Internal function to return the current state of a container with a healthcheck.
 // This function does not lock the container.
 func (c *Container) healthCheckStatus() (string, error) {
 	if !c.HasHealthCheck() {
-		return "", fmt.Errorf("container %s has no defined healthcheck", c.ID())
+		return "", nil
 	}
 
 	if err := c.syncContainer(); err != nil {

pkg/ps/ps.go

@@ -137,6 +137,7 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 		cgroup, ipc, mnt, net, pidns, user, uts string
 		portMappings                            []libnetworkTypes.PortMapping
 		networks                                []string
+		healthStatus                            string
 	)
 
 	batchErr := ctr.Batch(func(c *libpod.Container) error {
@@ -180,6 +181,11 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 			return err
 		}
 
+		healthStatus, err = c.HealthCheckStatus()
+		if err != nil {
+			return err
+		}
+
 		if !opts.Size && !opts.Namespace {
 			return nil
 		}
@@ -237,6 +243,7 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 		Size:       size,
 		StartedAt:  startedTime.Unix(),
 		State:      conState.String(),
+		Status:     healthStatus,
 	}
 	if opts.Pod && len(conConfig.Pod) > 0 {
 		podName, err := rt.GetName(conConfig.Pod)
@@ -261,12 +268,6 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 		}
 	}
 
-	if hc, err := ctr.HealthCheckStatus(); err == nil {
-		ps.Status = hc
-	} else {
-		logrus.Debug(err)
-	}
-
 	return ps, nil
 }