Browse Source

cli: Wrong error message from "node ps" outside swarm mode

"docker node ps" behaves strangely outside swarm mode:

    $ docker node ps
    ID                  NAME                IMAGE               NODE                DESIRED STATE       CURRENT STATE       ERROR               PORTS
    Error: No such node:

It should explain that the node is not a swarm manager.

The reason this happens is that the argument to "docker node ps" defaults
to "self". The first thing the command does is try to resolve "self" to
a node ID using the /info endpoint. If there is no node ID, it tries to
use the empty string as an ID, and tries to GET /nodes/, which is not a
valid endpoint.

Change the command to check if the node ID is present in the /info
response. If it isn't, a swarm API endpoint can supply a useful error
message.

Also, avoid printing the column headers if the only following text is an
error.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Aaron Lehmann 8 năm trước cách đây
mục cha
commit
ad1c96c6a7
3 tập tin đã thay đổi với 18 bổ sung3 xóa
  1. 13 0
      cli/command/node/cmd.go
  2. 1 1
      cli/command/node/inspect_test.go
  3. 4 2
      cli/command/node/ps.go

+ 13 - 0
cli/command/node/cmd.go

@@ -1,6 +1,9 @@
 package node
 
 import (
+	"errors"
+
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	apiclient "github.com/docker/docker/client"
@@ -38,6 +41,16 @@ func Reference(ctx context.Context, client apiclient.APIClient, ref string) (str
 		if err != nil {
 			return "", err
 		}
+		if info.Swarm.NodeID == "" {
+			// If there's no node ID in /info, the node probably
+			// isn't a manager. Call a swarm-specific endpoint to
+			// get a more specific error message.
+			_, err = client.NodeList(ctx, types.NodeListOptions{})
+			if err != nil {
+				return "", err
+			}
+			return "", errors.New("node ID not found in /info")
+		}
 		return info.Swarm.NodeID, nil
 	}
 	return ref, nil

+ 1 - 1
cli/command/node/inspect_test.go

@@ -49,7 +49,7 @@ func TestNodeInspectErrors(t *testing.T) {
 				return swarm.Node{}, []byte{}, fmt.Errorf("error inspecting the node")
 			},
 			infoFunc: func() (types.Info, error) {
-				return types.Info{}, nil
+				return types.Info{Swarm: swarm.Info{NodeID: "abc"}}, nil
 			},
 			expectedError: "error inspecting the node",
 		},

+ 4 - 2
cli/command/node/ps.go

@@ -95,8 +95,10 @@ func runPs(dockerCli command.Cli, opts psOptions) error {
 		}
 	}
 
-	if err := task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), !opts.noTrunc, opts.quiet, format); err != nil {
-		errs = append(errs, err.Error())
+	if len(errs) == 0 || len(tasks) != 0 {
+		if err := task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), !opts.noTrunc, opts.quiet, format); err != nil {
+			errs = append(errs, err.Error())
+		}
 	}
 
 	if len(errs) > 0 {