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

client: PR cleanup - improved logging around kill task in SIDS hook

Browse Source
This commit is contained in:
Seth Hoenig
2020-01-30 13:40:56 -06:00
parent f8949dde35
commit 91c7dbaa8d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/allocrunner/taskrunner/sids_hook.go
View File

@@ -194,7 +194,8 @@ func (h *sidsHook) deriveSIToken(ctx context.Context) (string, error) {
select {
case result := <-resultCh:
if result.err != nil {
h.kill(ctx, errors.Wrap(result.err, "consul: failed to derive SI token"))
h.logger.Error("failed to derive SI token", "error", result.err)
h.kill(ctx, errors.Wrap(result.err, "failed to derive SI token"))
return "", result.err
}
return result.token, nil
@@ -204,13 +205,14 @@ func (h *sidsHook) deriveSIToken(ctx context.Context) (string, error) {
}
}
func (h *sidsHook) kill(ctx context.Context, err error) {
_ = h.lifecycle.Kill(
ctx,
func (h *sidsHook) kill(ctx context.Context, reason error) {
if err := h.lifecycle.Kill(ctx,
structs.NewTaskEvent(structs.TaskKilling).
SetFailsTask().
SetDisplayMessage(err.Error()),
)
SetDisplayMessage(reason.Error()),
); err != nil {
h.logger.Error("failed to kill task", "kill_reason", reason, "error", err)
}
}
// tryDerive loops forever until a token is created, or ctx is done.