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

nomad: rename util method

This commit is contained in:
Armon Dadgar 2015-08-13 16:40:51 -07:00
parent eafa8ccd21
commit 194723e7bf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nomad/client_endpoint.go
View File

@ -51,7 +51,7 @@ func (c *Client) Register(args *structs.NodeRegisterRequest, reply *structs.Node
reply.NodeModifyIndex = index
// Check if we should trigger evaluations
if structs.ShouldEvaluateNode(args.Node.Status) {
if structs.ShouldDrainNode(args.Node.Status) {
evalIDs, evalIndex, err := c.createNodeEvals(args.Node.ID, index)
if err != nil {
c.srv.logger.Printf("[ERR] nomad.client: eval creation failed: %v", err)
@ -125,7 +125,7 @@ func (c *Client) UpdateStatus(args *structs.NodeUpdateStatusRequest, reply *stru
reply.NodeModifyIndex = index
// Check if we should trigger evaluations
if structs.ShouldEvaluateNode(args.Status) {
if structs.ShouldDrainNode(args.Status) {
evalIDs, evalIndex, err := c.createNodeEvals(args.NodeID, index)
if err != nil {
c.srv.logger.Printf("[ERR] nomad.client: eval creation failed: %v", err)

4
nomad/structs/structs.go
View File

@ -279,9 +279,9 @@ const (
NodeStatusDown = "down"
)
// ShouldEvaluateNode checks if a given node status should trigger an
// ShouldDrainNode checks if a given node status should trigger an
// evaluation. Some states don't require any further action.
func ShouldEvaluateNode(status string) bool {
func ShouldDrainNode(status string) bool {
switch status {
case NodeStatusInit, NodeStatusReady, NodeStatusMaint:
return false