kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #24323 from avsm/better-leave-grammar 

Improve the warning messages when leaving a Swarm cluster
This commit is contained in:
Vincent Demeester 2016-07-06 12:00:20 +02:00 committed by GitHub
parent 2cc5383f2f 22a3d1fa20
commit c70e432cee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/cluster/cluster.go
View File

@ -412,18 +412,18 @@ func (c *Cluster) Leave(force bool) error {
if err == nil { if err == nil {
if active && reachable-2 <= unreachable { if active && reachable-2 <= unreachable {
if reachable == 1 && unreachable == 0 { if reachable == 1 && unreachable == 0 {
msg += "Leaving last manager will remove all current state of the cluster. Use `--force` to ignore this message. " msg += "Removing the last manager will erase all current state of the cluster. Use `--force` to ignore this message. "
c.Unlock() c.Unlock()
return fmt.Errorf(msg) return fmt.Errorf(msg)
} }
msg += fmt.Sprintf("Leaving cluster will leave you with %v managers out of %v. This means Raft quorum will be lost and your cluster will become inaccessible. ", reachable-1, reachable+unreachable) msg += fmt.Sprintf("Leaving the cluster will leave you with %v managers out of %v. This means Raft quorum will be lost and your cluster will become inaccessible. ", reachable-1, reachable+unreachable)
} }
} }
} else { } else {
msg += "Doing so may lose the consensus of your cluster. " msg += "Doing so may lose the consensus of your cluster. "
} }
msg += "Only way to restore a cluster that has lost consensus is to reinitialize it with `--force-new-cluster`. Use `--force` to ignore this message." msg += "The only way to restore a cluster that has lost consensus is to reinitialize it with `--force-new-cluster`. Use `--force` to ignore this message."
c.Unlock() c.Unlock()
return fmt.Errorf(msg) return fmt.Errorf(msg)
} }