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

services: ensure task group is set on service hook (#16240) 

This PR fixes a bug where the task group information was not being set
on the serviceHook.AllocInfo struct, which is needed later on for calculating
the CheckID of a nomad service check. The CheckID is calculated independently
from multiple callsites, and the information being passed in must be consistent,
including the group name.

The workload.AllocInfo.Group was not set at this callsite, due to the bug fixed in this PR.
 https://github.com/hashicorp/nomad/blob/main/client/serviceregistration/nsd/nsd.go#L114
This commit is contained in:
Seth Hoenig 2023-02-22 10:22:48 -06:00 committed by GitHub
parent c9ffd1274b
commit 804f9fdb93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/16240.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
services: Fixed a bug where check_restart on nomad services on tasks failed with incorrect CheckIDs
```

16
client/allocrunner/taskrunner/script_check_hook_test.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
"github.com/hashicorp/nomad/ci" "github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces" "github.com/hashicorp/nomad/client/allocrunner/taskrunner/interfaces"
"github.com/hashicorp/nomad/client/serviceregistration" "github.com/hashicorp/nomad/client/serviceregistration"
@ -19,6 +19,7 @@ import (
"github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/helper/testlog"
"github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
"github.com/shoenig/test/must"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -271,14 +272,17 @@ func TestScript_TaskEnvInterpolation(t *testing.T) {
scHook.taskEnv = env scHook.taskEnv = env
scHook.driverExec = exec scHook.driverExec = exec
expectedSvc := svcHook.getWorkloadServices().Services[0] workload := svcHook.getWorkloadServices()
must.Eq(t, "web", workload.AllocInfo.Group)
expectedSvc := workload.Services[0]
expected := agentconsul.MakeCheckID(serviceregistration.MakeAllocServiceID( expected := agentconsul.MakeCheckID(serviceregistration.MakeAllocServiceID(
alloc.ID, task.Name, expectedSvc), expectedSvc.Checks[0]) alloc.ID, task.Name, expectedSvc), expectedSvc.Checks[0])
actual := scHook.newScriptChecks() actual := scHook.newScriptChecks()
check, ok := actual[expected] check, ok := actual[expected]
require.True(t, ok) must.True(t, ok)
require.Equal(t, "my-job-frontend-check", check.check.Name) must.Eq(t, "my-job-frontend-check", check.check.Name)
// emulate an update // emulate an update
env = taskenv.NewBuilder(mock.Node(), alloc, task, "global").SetHookEnv( env = taskenv.NewBuilder(mock.Node(), alloc, task, "global").SetHookEnv(
@ -293,8 +297,8 @@ func TestScript_TaskEnvInterpolation(t *testing.T) {
actual = scHook.newScriptChecks() actual = scHook.newScriptChecks()
check, ok = actual[expected] check, ok = actual[expected]
require.True(t, ok) must.True(t, ok)
require.Equal(t, "my-job-backend-check", check.check.Name) must.Eq(t, "my-job-backend-check", check.check.Name)
} }
func TestScript_associated(t *testing.T) { func TestScript_associated(t *testing.T) {

1
client/allocrunner/taskrunner/service_hook.go
View File

@ -224,6 +224,7 @@ func (h *serviceHook) getWorkloadServices() *serviceregistration.WorkloadService
info := structs.AllocInfo{ info := structs.AllocInfo{
AllocID: h.allocID, AllocID: h.allocID,
JobID: h.jobID, JobID: h.jobID,
Group: h.groupName,
Task: h.taskName, Task: h.taskName,
Namespace: h.namespace, Namespace: h.namespace,
} }