From 871ee3d12b0b9e2e1c10d335d1446c05bd1e4d6a Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 28 Nov 2016 18:08:45 +0100 Subject: [PATCH 1/2] Revert "Add -a option to service/node ps" This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db. Signed-off-by: Vincent Demeester Upstream-commit: eb55d03f3c321e31c8da993233b2679f47d5b4e1 Component: engine --- components/engine/cli/command/node/ps.go | 7 -- components/engine/cli/command/service/ps.go | 8 -- .../docs/reference/commandline/node_ps.md | 2 +- .../docs/reference/commandline/service_ps.md | 1 - .../integration-cli/docker_cli_swarm_test.go | 82 ------------------- 5 files changed, 1 insertion(+), 99 deletions(-) diff --git a/components/engine/cli/command/node/ps.go b/components/engine/cli/command/node/ps.go index 8591f04669..a034721d24 100644 --- a/components/engine/cli/command/node/ps.go +++ b/components/engine/cli/command/node/ps.go @@ -17,7 +17,6 @@ import ( type psOptions struct { nodeIDs []string - all bool noResolve bool noTrunc bool filter opts.FilterOpt @@ -44,7 +43,6 @@ func newPsCommand(dockerCli *command.DockerCli) *cobra.Command { flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output") flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names") flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided") - flags.BoolVarP(&opts.all, "all", "a", false, "Show all tasks (default shows tasks that are or will be running)") return cmd } @@ -74,11 +72,6 @@ func runPs(dockerCli *command.DockerCli, opts psOptions) error { filter := opts.filter.Value() filter.Add("node", node.ID) - if !opts.all && !filter.Include("desired-state") { - filter.Add("desired-state", string(swarm.TaskStateRunning)) - filter.Add("desired-state", string(swarm.TaskStateAccepted)) - } - nodeTasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter}) if err != nil { errs = append(errs, err.Error()) diff --git a/components/engine/cli/command/service/ps.go b/components/engine/cli/command/service/ps.go index 0028507c22..cf94ad7374 100644 --- a/components/engine/cli/command/service/ps.go +++ b/components/engine/cli/command/service/ps.go @@ -2,7 +2,6 @@ package service import ( "github.com/docker/docker/api/types" - "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/cli" "github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command/idresolver" @@ -15,7 +14,6 @@ import ( type psOptions struct { serviceID string - all bool quiet bool noResolve bool noTrunc bool @@ -39,7 +37,6 @@ func newPsCommand(dockerCli *command.DockerCli) *cobra.Command { flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output") flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names") flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided") - flags.BoolVarP(&opts.all, "all", "a", false, "Show all tasks (default shows tasks that are or will be running)") return cmd } @@ -67,11 +64,6 @@ func runPS(dockerCli *command.DockerCli, opts psOptions) error { } } - if !opts.all && !filter.Include("desired-state") { - filter.Add("desired-state", string(swarm.TaskStateRunning)) - filter.Add("desired-state", string(swarm.TaskStateAccepted)) - } - tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter}) if err != nil { return err diff --git a/components/engine/docs/reference/commandline/node_ps.md b/components/engine/docs/reference/commandline/node_ps.md index 7a4054bebe..0c54c9cfb0 100644 --- a/components/engine/docs/reference/commandline/node_ps.md +++ b/components/engine/docs/reference/commandline/node_ps.md @@ -22,7 +22,7 @@ Usage: docker node ps [OPTIONS] [NODE...] List tasks running on one or more nodes, defaults to current node. Options: - -a, --all Show all tasks (default shows tasks that are or will be running) + -a, --all Display all instances -f, --filter value Filter output based on conditions provided --help Print usage --no-resolve Do not map IDs to Names diff --git a/components/engine/docs/reference/commandline/service_ps.md b/components/engine/docs/reference/commandline/service_ps.md index 2554267f39..b824f53dab 100644 --- a/components/engine/docs/reference/commandline/service_ps.md +++ b/components/engine/docs/reference/commandline/service_ps.md @@ -22,7 +22,6 @@ Usage: docker service ps [OPTIONS] SERVICE List the tasks of a service Options: - -a, --all Show all tasks (default shows tasks that are or will be running) -f, --filter filter Filter output based on conditions provided --help Print usage --no-resolve Do not map IDs to Names diff --git a/components/engine/integration-cli/docker_cli_swarm_test.go b/components/engine/integration-cli/docker_cli_swarm_test.go index c38a707aec..4bccea878f 100644 --- a/components/engine/integration-cli/docker_cli_swarm_test.go +++ b/components/engine/integration-cli/docker_cli_swarm_test.go @@ -219,88 +219,6 @@ func (s *DockerSwarmSuite) TestSwarmNodeTaskListFilter(c *check.C) { c.Assert(out, checker.Not(checker.Contains), name+".1") c.Assert(out, checker.Not(checker.Contains), name+".2") c.Assert(out, checker.Not(checker.Contains), name+".3") - - out, err = d.Cmd("node", "ps", "--filter", "desired-state=running", "self") - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Contains, name+".1") - c.Assert(out, checker.Contains, name+".2") - c.Assert(out, checker.Contains, name+".3") - - out, err = d.Cmd("node", "ps", "--filter", "desired-state=shutdown", "self") - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Not(checker.Contains), name+".1") - c.Assert(out, checker.Not(checker.Contains), name+".2") - c.Assert(out, checker.Not(checker.Contains), name+".3") -} - -func (s *DockerSwarmSuite) TestSwarmServiceTaskListAll(c *check.C) { - d := s.AddDaemon(c, true, true) - - name := "service-task-list-1" - out, err := d.Cmd("service", "create", "--name", name, "--replicas=3", "busybox", "top") - c.Assert(err, checker.IsNil) - c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "") - - // make sure task has been deployed. - waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 3) - - out, err = d.Cmd("service", "ps", name) - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Contains, name+".1") - c.Assert(out, checker.Contains, name+".2") - c.Assert(out, checker.Contains, name+".3") - - // Get the last container id so we can restart it to cause a task error in the history - containerID, err := d.Cmd("ps", "-q", "-l") - c.Assert(err, checker.IsNil) - - _, err = d.Cmd("stop", strings.TrimSpace(containerID)) - c.Assert(err, checker.IsNil) - - waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 3) - - out, err = d.Cmd("service", "ps", name) - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Count, name, 3) - - out, err = d.Cmd("service", "ps", name, "-a") - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Count, name, 4) -} - -func (s *DockerSwarmSuite) TestSwarmNodeTaskListAll(c *check.C) { - d := s.AddDaemon(c, true, true) - - name := "node-task-list" - out, err := d.Cmd("service", "create", "--name", name, "--replicas=3", "busybox", "top") - c.Assert(err, checker.IsNil) - c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "") - - // make sure task has been deployed. - waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 3) - - out, err = d.Cmd("service", "ps", name) - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Contains, name+".1") - c.Assert(out, checker.Contains, name+".2") - c.Assert(out, checker.Contains, name+".3") - - // Get the last container id so we can restart it to cause a task error in the history - containerID, err := d.Cmd("ps", "-q", "-l") - c.Assert(err, checker.IsNil) - - _, err = d.Cmd("stop", strings.TrimSpace(containerID)) - c.Assert(err, checker.IsNil) - - waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 3) - - out, err = d.Cmd("node", "ps", "self") - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Count, name, 3) - - out, err = d.Cmd("node", "ps", "self", "-a") - c.Assert(err, checker.IsNil) - c.Assert(out, checker.Count, name, 4) } // Test case for #25375 From 23d4c1466cc624a0b07e215ad2271f6df9d8a759 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 29 Nov 2016 09:33:03 +0100 Subject: [PATCH 2/2] Revert "Add bash completion for `docker service ps --all`" This reverts commit 188d2fac57d63888f08531adc46aa3349e3b4f3a. Signed-off-by: Vincent Demeester Upstream-commit: cee0fff9fe31da79fc45b9f7b42a2e6d1e25babe Component: engine --- components/engine/contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 5f1a398aa7..8d652a2bd9 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -2623,7 +2623,7 @@ _docker_service_ps() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve --no-trunc --quiet -q" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--filter -f --help --no-resolve --no-trunc --quiet -q" -- "$cur" ) ) ;; *) local counter=$(__docker_pos_first_nonflag '--filter|-f')