fix nerdctl ps show nothing when timeout

Author: ningmingxiao

cmd/nerdctl/compose/compose_ps.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"strings"
 	"text/tabwriter"
-	"time"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
@@ -345,28 +344,30 @@ func formatPublishers(labelMap map[string]string) []PortPublisher {
 
 // statusForFilter returns the status value to be matched with the 'status' filter
 func statusForFilter(ctx context.Context, c containerd.Container) string {
-	// Just in case, there is something wrong in server.
-	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-
-	task, err := c.Task(ctx, nil)
-	if err != nil {
+	var errorStatus error
+	defer func() {
+		if errorStatus != nil && ctx.Err() == context.DeadlineExceeded {
+			log.L.WithError(errorStatus).Warnf("failed to get container %s status", c.ID())
+		}
+	}()
+	task, errorStatus := c.Task(ctx, nil)
+	if errorStatus != nil {
 		// NOTE: NotFound doesn't mean that container hasn't started.
 		// In docker/CRI-containerd plugin, the task will be deleted
 		// when it exits. So, the status will be "created" for this
 		// case.
-		if errdefs.IsNotFound(err) {
+		if errdefs.IsNotFound(errorStatus) {
 			return string(containerd.Created)
 		}
 		return string(containerd.Unknown)
 	}
 
-	status, err := task.Status(ctx)
-	if err != nil {
+	status, errorStatus := task.Status(ctx)
+	if errorStatus != nil {
 		return string(containerd.Unknown)
 	}
-	labels, err := c.Labels(ctx)
-	if err != nil {
+	labels, errorStatus := c.Labels(ctx)
+	if errorStatus != nil {
 		return string(containerd.Unknown)
 	}
 

pkg/containerutil/containerutil.go

@@ -86,10 +86,6 @@ func PrintHostPort(ctx context.Context, writer io.Writer, container containerd.C
 
 // ContainerStatus returns the container's status from its task.
 func ContainerStatus(ctx context.Context, c containerd.Container) (containerd.Status, error) {
-	// Just in case, there is something wrong in server.
-	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-
 	task, err := c.Task(ctx, nil)
 	if err != nil {
 		return containerd.Status{}, err

pkg/formatter/formatter.go

@@ -39,29 +39,31 @@ import (
 )
 
 func ContainerStatus(ctx context.Context, c containerd.Container) string {
-	// Just in case, there is something wrong in server.
-	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
 	titleCaser := cases.Title(language.English)
-
-	task, err := c.Task(ctx, nil)
-	if err != nil {
+	var errorStatus error
+	defer func() {
+		if errorStatus != nil && ctx.Err() == context.DeadlineExceeded {
+			log.L.WithError(errorStatus).Warnf("failed to get container %s status", c.ID())
+		}
+	}()
+	task, errorStatus := c.Task(ctx, nil)
+	if errorStatus != nil {
 		// NOTE: NotFound doesn't mean that container hasn't started.
 		// In docker/CRI-containerd plugin, the task will be deleted
 		// when it exits. So, the status will be "created" for this
 		// case.
-		if errdefs.IsNotFound(err) {
+		if errdefs.IsNotFound(errorStatus) {
 			return titleCaser.String(string(containerd.Created))
 		}
 		return titleCaser.String(string(containerd.Unknown))
 	}
 
-	status, err := task.Status(ctx)
-	if err != nil {
+	status, errorStatus := task.Status(ctx)
+	if errorStatus != nil {
 		return titleCaser.String(string(containerd.Unknown))
 	}
-	labels, err := c.Labels(ctx)
-	if err != nil {
+	labels, errorStatus := c.Labels(ctx)
+	if errorStatus != nil {
 		return titleCaser.String(string(containerd.Unknown))
 	}