backport of commit 8493f3a

client/client.go

@@ -1900,11 +1900,12 @@ 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
+		if resp.SchedulingEligibility != "" {
+			c.Node.SchedulingEligibility = resp.SchedulingEligibility
 		}
 	})
 

nomad/node_endpoint.go

@@ -275,9 +275,7 @@ func (n *Node) constructNodeServerInfoResponse(nodeID string, snap *state.StateS
 
 	// Add ClientStatus information to heartbeat response.
 	node, _ := snap.NodeByID(nil, nodeID)
-	reply.ClientStatus = &structs.ClientStatus{
-		SchedulingEligibility: node.SchedulingEligibility,
-	}
+	reply.SchedulingEligibility = node.SchedulingEligibility
 
 	// TODO(sean@): Use an indexed node count instead
 	//

nomad/structs/structs.go

@@ -1339,19 +1339,13 @@ type NodeUpdateResponse struct {
 	// region.
 	Servers []*NodeServerInfo
 
-	// ClientStatus is used to inform clients what the server-side
+	// SchedulingEligibility is used to inform clients what the server-side
 	// has for their scheduling status during heartbeats.
-	ClientStatus *ClientStatus
+	SchedulingEligibility string
 
 	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