kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix tests, update changelog

Browse Source
This commit is contained in:
Drew Bailey
2020-01-29 13:55:14 -05:00
parent fbd50806a1
commit 2dbcad3f45
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -18,9 +18,10 @@ IMPROVEMENTS:
BUG FIXES:
* agent: Fixed race condition in logging when using `nomad monitor` command [[GH-6872](https://github.com/hashicorp/nomad/issues/6872)]
* agent: Fixed a bug where `nomad monitor -server-id` only work for a server's name instead of uuid or name. [[GH-7015](https://github.com/hashicorp/nomad/issues/7015)]
* cli: Fixed a bug where `nomad monitor -node-id` would cause a cli panic when no nodes where found. [[GH-6828](https://github.com/hashicorp/nomad/issues/6828)]
* config: Fixed a bug where agent startup would fail if the `consul.timeout` configuration was set. [[GH-6907](https://github.com/hashicorp/nomad/issues/6907)]
* consul: Fixed a bug where script-based health checks would fail if the service configuration included interpolation. [[GH-6916](https://github.com/hashicorp/nomad/issues/6916)]
* consul: Fixed a bug where script-based health checks would fail if the service configuration included interpolation. [[GH-6916](https://github.com/hashicorp/nomad/issues/6916)]
* consul/connect: Fixed a bug where Connect-enabled jobs failed to validate when service names used interpolation. [[GH-6855](https://github.com/hashicorp/nomad/issues/6855)]
* scheduler: Fixed a bug that caused evicted allocs on a lost node to be stuck in running. [[GH-6902](https://github.com/hashicorp/nomad/issues/6902)]
* scheduler: Fixed a bug where `nomad job plan/apply` returned errors instead of a partial placement warning for ineligible nodes. [[GH-6968](https://github.com/hashicorp/nomad/issues/6968)]

2
api/agent_test.go
View File

@@ -407,7 +407,7 @@ func TestAgentCPUProfile(t *testing.T) {
}
resp, err := agent.CPUProfile(opts, q)
require.Error(t, err)
require.Contains(t, err.Error(), "500 (unknown nomad server unknown.global)")
require.Contains(t, err.Error(), "500 (unknown Nomad server unknown.global)")
require.Nil(t, resp)
}

4
e2e/connect/input/multi-service.nomad
View File

@@ -25,7 +25,7 @@ job "multi-service" {
config {
image = "hashicorp/http-echo"
args = ["-listen=:9001", "-text=echo1"]
args = ["-listen=:9001", "-text=echo1"]
}
}
@@ -43,7 +43,7 @@ job "multi-service" {
config {
image = "hashicorp/http-echo"
args = ["-listen=:9002", "-text=echo2"]
args = ["-listen=:9002", "-text=echo2"]
}
}
}

7
nomad/client_agent_endpoint_test.go
View File

@@ -330,6 +330,9 @@ func TestMonitor_MonitorServer(t *testing.T) {
// No node ID to monitor the remote server
req := cstructs.MonitorRequest{
LogLevel: "debug",
QueryOptions: structs.QueryOptions{
Region: "global",
},
}
handler, err := s.StreamingRpcHandler("Agent.Monitor")
@@ -589,7 +592,7 @@ func TestAgentProfile_RemoteRegionMisMatch(t *testing.T) {
reply := structs.AgentPprofResponse{}
err := s1.RPC("Agent.Profile", &req, &reply)
require.Contains(err.Error(), "does not exist in requested region")
require.Contains(err.Error(), "unknown Nomad server")
require.Nil(reply.Payload)
}
@@ -704,7 +707,7 @@ func TestAgentProfile_Server(t *testing.T) {
serverID: uuid.Generate(),
origin: nonLeader,
reqType: pprof.CmdReq,
expectedErr: "unknown nomad server",
expectedErr: "unknown Nomad server",
expectedAgentID: "",
},
}