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: use interpolated address when performing health checks (#18584)

Browse Source 
* fix: use interpolated address when performing health checks

* Fix tests, add changelog

* Update .changelog/18584.txt

Co-authored-by: Seth Hoenig <shoenig@duck.com>

---------

Co-authored-by: Seth Hoenig <shoenig@duck.com>
This commit is contained in:
Matthew Salsamendi
2023-10-04 05:58:55 -07:00
committed by GitHub
parent fb7582d596
commit aa9ff3a5b3
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/18584.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
services: use interpolated address when performing nomad service health checks
```

4
client/allocrunner/alloc_runner_hooks.go
View File

@@ -110,7 +110,7 @@ func (ar *allocRunner) initRunnerHooks(config *clientconfig.Config) error {
}
// Create a taskenv.TaskEnv which is used for read only purposes by the
// newNetworkHook.
// newNetworkHook and newChecksHook.
builtTaskEnv := newEnvBuilder().Build()
// Create the alloc directory hook. This is run first to ensure the
@@ -139,7 +139,7 @@ func (ar *allocRunner) initRunnerHooks(config *clientconfig.Config) error {
newConsulGRPCSocketHook(hookLogger, alloc, ar.allocDir, config.ConsulConfig, config.Node.Attributes),
newConsulHTTPSocketHook(hookLogger, alloc, ar.allocDir, config.ConsulConfig),
newCSIHook(alloc, hookLogger, ar.csiManager, ar.rpcClient, ar, ar.hookResources, ar.clientConfig.Node.SecretID),
newChecksHook(hookLogger, alloc, ar.checkStore, ar),
newChecksHook(hookLogger, alloc, ar.checkStore, ar, builtTaskEnv),
}
if config.ExtraAllocHooks != nil {
ar.runnerHooks = append(ar.runnerHooks, config.ExtraAllocHooks...)

8
client/allocrunner/checks_hook.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/hashicorp/nomad/client/allocrunner/interfaces"
"github.com/hashicorp/nomad/client/serviceregistration/checks"
"github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore"
"github.com/hashicorp/nomad/client/taskenv"
"github.com/hashicorp/nomad/helper"
"github.com/hashicorp/nomad/nomad/structs"
)
@@ -82,6 +83,7 @@ type checksHook struct {
shim checkstore.Shim
checker checks.Checker
allocID string
taskEnv *taskenv.TaskEnv
// fields that get re-initialized on allocation update
lock sync.RWMutex
@@ -96,6 +98,7 @@ func newChecksHook(
alloc *structs.Allocation,
shim checkstore.Shim,
network structs.NetworkStatus,
taskEnv *taskenv.TaskEnv,
) *checksHook {
h := &checksHook{
logger: logger.Named(checksHookName),
@@ -104,6 +107,7 @@ func newChecksHook(
shim: shim,
network: network,
checker: checks.New(logger),
taskEnv: taskEnv,
}
h.initialize(alloc)
return h
@@ -208,8 +212,10 @@ func (h *checksHook) Prerun() error {
return nil
}
interpolatedServices := taskenv.InterpolateServices(h.taskEnv, group.NomadServices())
// create and start observers of nomad service checks in alloc
h.observe(h.alloc, group.NomadServices())
h.observe(h.alloc, interpolatedServices)
return nil
}

9
client/allocrunner/checks_hook_test.go
View File

@@ -17,6 +17,7 @@ import (
"github.com/hashicorp/nomad/client/allocrunner/interfaces"
"github.com/hashicorp/nomad/client/serviceregistration/checks/checkstore"
"github.com/hashicorp/nomad/client/state"
"github.com/hashicorp/nomad/client/taskenv"
"github.com/hashicorp/nomad/helper/testlog"
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"
@@ -169,7 +170,9 @@ func TestCheckHook_Checks_ResultsSet(t *testing.T) {
alloc := allocWithNomadChecks(addr, port, tc.onGroup)
h := newChecksHook(logger, alloc, checkStore, network)
envBuilder := taskenv.NewBuilder(mock.Node(), alloc, nil, alloc.Job.Region)
h := newChecksHook(logger, alloc, checkStore, network, envBuilder.Build())
// initialize is called; observers are created but not started yet
must.MapEmpty(t, h.observers)
@@ -234,7 +237,9 @@ func TestCheckHook_Checks_UpdateSet(t *testing.T) {
alloc := allocWithNomadChecks(addr, port, true)
h := newChecksHook(logger, alloc, shim, network)
envBuilder := taskenv.NewBuilder(mock.Node(), alloc, nil, alloc.Job.Region)
h := newChecksHook(logger, alloc, shim, network, envBuilder.Build())
// calling pre-run starts the observers
err := h.Prerun()