starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-26 01:10:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update daemon to new swarmkit

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 25a89d73e57e46dd23caebcb6446c7edd6e07f56
Component: engine
This commit is contained in:
Tonis Tiigi
2016-06-14 17:23:35 -07:00
parent d1fb87c721
commit a7a6c7f5a8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/cluster.go
+2 -2
View File
@@ -998,13 +998,13 @@ func (c *Cluster) managerStats() (current bool, reachable int, unreachable int,
}
for _, n := range nodes.Nodes {
if n.ManagerStatus != nil {
if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
reachable++
if n.ID == c.node.NodeID() {
current = true
}
}
if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
unreachable++
}
}
components/engine/daemon/cluster/convert/node.go
+3 -3
View File
@@ -56,9 +56,9 @@ func NodeFromGRPC(n swarmapi.Node) types.Node {
//Manager
if n.ManagerStatus != nil {
node.ManagerStatus = &types.ManagerStatus{
Leader: n.ManagerStatus.Raft.Status.Leader,
Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Raft.Status.Reachability.String())),
Addr: n.ManagerStatus.Raft.Addr,
Leader: n.ManagerStatus.Leader,
Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Reachability.String())),
Addr: n.ManagerStatus.Addr,
}
}