Commit f67b0d0e authored by Kyle Havlovitz's avatar Kyle Havlovitz
Browse files

Add missing exist checks and doc line

Showing with 13 additions and 7 deletions
+13 -7
......@@ -54,15 +54,17 @@ func (op *Operator) RaftGetConfiguration(args *structs.GenericRequest, reply *st
raftProtocolVersion := "unknown"
if member, ok := serverMap[server.Address]; ok {
node = member.Name
raftProtocolVersion = member.Tags["raft_vsn"]
if raftVsn, ok := member.Tags["raft_vsn"]; ok {
raftProtocolVersion = raftVsn
}
}
entry := &structs.RaftServer{
ID: server.ID,
Node: node,
Address: server.Address,
Leader: server.Address == leader,
Voter: server.Suffrage == raft.Voter,
ID: server.ID,
Node: node,
Address: server.Address,
Leader: server.Address == leader,
Voter: server.Suffrage == raft.Voter,
RaftProtocol: raftProtocolVersion,
}
reply.Servers = append(reply.Servers, entry)
......
......@@ -62,7 +62,10 @@ func isNomadServer(m serf.Member) (bool, *serverParts) {
return false, nil
}
id := m.Tags["id"]
id := "unknown"
if v, ok := m.Tags["id"]; ok {
id = v
}
region := m.Tags["region"]
datacenter := m.Tags["dc"]
_, bootstrap := m.Tags["bootstrap"]
......
......@@ -59,6 +59,7 @@ $ curl \
"ID": "127.0.0.1:4647",
"Leader": true,
"Node": "bacon-mac.global",
"RaftProtocol": 2,
"Voter": true
}
]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment