luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Always pass in a snapshot before calling constructNodeServerInfoResponse()

This commit is contained in:
Sean Chittenden 2016-06-10 01:16:02 -04:00
parent 1df6fc253f
commit 0ba1da9c9c
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nomad/node_endpoint.go
View File

@ -102,10 +102,14 @@ func (n *Node) Register(args *structs.NodeRegisterRequest, reply *structs.NodeUp
// Set the reply index
reply.Index = index
snap, err := n.srv.fsm.State().Snapshot()
if err != nil {
return err
}
n.srv.peerLock.RLock()
defer n.srv.peerLock.RUnlock()
if err := n.constructNodeServerInfoResponse(nil, reply); err != nil {
if err := n.constructNodeServerInfoResponse(snap, reply); err != nil {
n.srv.logger.Printf("[ERR] nomad.client: failed to populate NodeUpdateResponse: %v", err)
return err
}
@ -129,14 +133,11 @@ func (n *Node) constructNodeServerInfoResponse(snap *state.StateSnapshot, reply
})
}
// Capture all the nodes to obtain the node count
if snap == nil {
ss, err := n.srv.fsm.State().Snapshot()
if err != nil {
return err
}
snap = ss
}
// TODO(sean@): Use an indexed node count instead
//
// Snapshot is used only to iterate over all nodes to create a node
// count to send back to Nomad Clients in their heartbeat so Clients
// can estimate the size of the cluster.
iter, err := snap.Nodes()
if err == nil {
for {