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

tests: deflake TestHTTP_NodeDrain 

A node may be recognized as not running any allocs and have its drain
flag reset before the test queries it.
This commit is contained in:
Mahmood Ali 2020-03-29 17:56:10 -04:00
parent b0cc23ae63
commit 8b2b3f99d3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
command/agent/node_endpoint_test.go
View File

@ -273,16 +273,26 @@ func TestHTTP_NodeDrain(t *testing.T) {
require.NotZero(respW.HeaderMap.Get("X-Nomad-Index"))
// Check the response
_, ok := obj.(structs.NodeDrainUpdateResponse)
dresp, ok := obj.(structs.NodeDrainUpdateResponse)
require.True(ok)
t.Logf("response index=%v node_update_index=0x%x", respW.HeaderMap.Get("X-Nomad-Index"),
dresp.NodeModifyIndex)
// Check that the node has been updated
state := s.Agent.server.State()
out, err := state.NodeByID(nil, node.ID)
require.Nil(err)
require.True(out.Drain)
require.NotNil(out.DrainStrategy)
require.Equal(10*time.Second, out.DrainStrategy.Deadline)
// the node must either be in drain mode or in elligible
// once the node is recognize as not having any running allocs
if out.Drain {
require.True(out.Drain)
require.NotNil(out.DrainStrategy)
require.Equal(10*time.Second, out.DrainStrategy.Deadline)
} else {
require.Equal(structs.NodeSchedulingIneligible, out.SchedulingEligibility)
}
// Make the HTTP request to unset drain
drainReq.DrainSpec = nil