kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

swarm: improve cli output on node promote/demote for unchanged role

Browse source 
As of now promoting (or demoting) a node that has its role
left unchanged will always print a successful message.

This PR fixes the issue by matching the behavior on swarmkit's
swarmctl command and printing a message when desired role is
the current role of the node.

As a result this also avoids calling update when it is not
necessary.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
This commit is contained in:
Alexandre Beslic 2016-08-05 15:51:32 -07:00
parent 6401bd65b1
commit 5479df79c7
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/client/node/demote.go
View file

@ -22,6 +22,10 @@ func newDemoteCommand(dockerCli *client.DockerCli) *cobra.Command {
func runDemote(dockerCli *client.DockerCli, nodes []string) error { func runDemote(dockerCli *client.DockerCli, nodes []string) error {
demote := func(node *swarm.Node) error { demote := func(node *swarm.Node) error {
if node.Spec.Role == swarm.NodeRoleWorker {
fmt.Fprintf(dockerCli.Out(), "Node %s is already a worker.\n", node.ID)
return errNoRoleChange
}
node.Spec.Role = swarm.NodeRoleWorker node.Spec.Role = swarm.NodeRoleWorker
return nil return nil
} }

4
api/client/node/promote.go
View file

@ -22,6 +22,10 @@ func newPromoteCommand(dockerCli *client.DockerCli) *cobra.Command {
func runPromote(dockerCli *client.DockerCli, nodes []string) error { func runPromote(dockerCli *client.DockerCli, nodes []string) error {
promote := func(node *swarm.Node) error { promote := func(node *swarm.Node) error {
if node.Spec.Role == swarm.NodeRoleManager {
fmt.Fprintf(dockerCli.Out(), "Node %s is already a manager.\n", node.ID)
return errNoRoleChange
}
node.Spec.Role = swarm.NodeRoleManager node.Spec.Role = swarm.NodeRoleManager
return nil return nil
} }

8
api/client/node/update.go
View file

@ -1,6 +1,7 @@
package node package node
import ( import (
"errors"
"fmt" "fmt"
"github.com/docker/docker/api/client" "github.com/docker/docker/api/client"
@ -13,6 +14,10 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
) )
var (
errNoRoleChange = errors.New("role was already set to the requested value")
)
func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command { func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
nodeOpts := newNodeOptions() nodeOpts := newNodeOptions()
@ -53,6 +58,9 @@ func updateNodes(dockerCli *client.DockerCli, nodes []string, mergeNode func(nod
err = mergeNode(&node) err = mergeNode(&node)
if err != nil { if err != nil {
if err == errNoRoleChange {
continue
}
return err return err
} }
err = client.NodeUpdate(ctx, node.ID, node.Version, node.Spec) err = client.NodeUpdate(ctx, node.ID, node.Version, node.Spec)