Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: Add client scheduling eligibility to heartbeat #14483

Merged
merged 4 commits into from
Sep 8, 2022
Merged

core: Add client scheduling eligibility to heartbeat #14483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb6a261
Add client scheduling eligibility to heartbeat
angrycub Sep 7, 2022
44baeb1
Add a nil guard
angrycub Sep 7, 2022
8493f3a
Incorporate review feedback
angrycub Sep 8, 2022
3e9a163
Add changelog message
angrycub Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1954,6 +1954,13 @@ func (c *Client) updateNodeStatus() error {
"req_latency", end.Sub(start), "heartbeat_ttl", oldTTL, "since_last_heartbeat", time.Since(last))
}
}
// Check heartbeat response for information about the server-side scheduling
// state of this node
c.UpdateConfig(func(c *config.Config) {
if resp.ClientStatus != nil {
c.Node.SchedulingEligibility = resp.ClientStatus.SchedulingEligibility
}
})

// Update the number of nodes in the cluster so we can adjust our server
// rebalance rate.
Expand Down
14 changes: 10 additions & 4 deletions nomad/node_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func (n *Node) Register(args *structs.NodeRegisterRequest, reply *structs.NodeUp

n.srv.peerLock.RLock()
defer n.srv.peerLock.RUnlock()
if err := n.constructNodeServerInfoResponse(snap, reply); err != nil {
if err := n.constructNodeServerInfoResponse(args.Node.ID, snap, reply); err != nil {
n.logger.Error("failed to populate NodeUpdateResponse", "error", err)
return err
}
Expand Down Expand Up @@ -258,7 +258,7 @@ func equalDevices(n1, n2 *structs.Node) bool {
}

// updateNodeUpdateResponse assumes the n.srv.peerLock is held for reading.
func (n *Node) constructNodeServerInfoResponse(snap *state.StateSnapshot, reply *structs.NodeUpdateResponse) error {
func (n *Node) constructNodeServerInfoResponse(nodeID string, snap *state.StateSnapshot, reply *structs.NodeUpdateResponse) error {
reply.LeaderRPCAddr = string(n.srv.raft.Leader())

// Reply with config information required for future RPC requests
Expand All @@ -271,6 +271,12 @@ func (n *Node) constructNodeServerInfoResponse(snap *state.StateSnapshot, reply
})
}

// Add ClientStatus information to heartbeat response.
node, _ := snap.NodeByID(nil, nodeID)
reply.ClientStatus = &structs.ClientStatus{
SchedulingEligibility: node.SchedulingEligibility,
}

// TODO(sean@): Use an indexed node count instead
//
// Snapshot is used only to iterate over all nodes to create a node
Expand Down Expand Up @@ -564,7 +570,7 @@ func (n *Node) UpdateStatus(args *structs.NodeUpdateStatusRequest, reply *struct
reply.Index = index
n.srv.peerLock.RLock()
defer n.srv.peerLock.RUnlock()
if err := n.constructNodeServerInfoResponse(snap, reply); err != nil {
if err := n.constructNodeServerInfoResponse(node.GetID(), snap, reply); err != nil {
n.logger.Error("failed to populate NodeUpdateResponse", "error", err)
return err
}
Expand Down Expand Up @@ -821,7 +827,7 @@ func (n *Node) Evaluate(args *structs.NodeEvaluateRequest, reply *structs.NodeUp

n.srv.peerLock.RLock()
defer n.srv.peerLock.RUnlock()
if err := n.constructNodeServerInfoResponse(snap, reply); err != nil {
if err := n.constructNodeServerInfoResponse(node.GetID(), snap, reply); err != nil {
n.logger.Error("failed to populate NodeUpdateResponse", "error", err)
return err
}
Expand Down
10 changes: 10 additions & 0 deletions nomad/structs/structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,9 +1361,19 @@ type NodeUpdateResponse struct {
// region.
Servers []*NodeServerInfo

// ClientStatus is used to inform clients what the server-side
// has for their scheduling status during heartbeats.
ClientStatus *ClientStatus
angrycub marked this conversation as resolved.
Show resolved Hide resolved

QueryMeta
}

// ClientStatus is used to inform clients what the server-side
// has for their scheduling status during heartbeats.
type ClientStatus struct {
SchedulingEligibility string
}

// NodeDrainUpdateResponse is used to respond to a node drain update
type NodeDrainUpdateResponse struct {
NodeModifyIndex uint64
Expand Down