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: correct the logic for LeaveOnTerm or LeaveOnInt depending on the incoming signal

Browse Source
This commit is contained in:
Juanadelacuesta
2025-04-23 16:03:12 +02:00
parent b375974bc3
commit adf038b495
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
command/agent/command.go
View File

@@ -978,13 +978,8 @@ func (c *Command) handleRetryJoin(config *Config) error {
return nil
}
func (c *Command) terminate(signalCh chan os.Signal, sdSock io.Writer) int {
// Bail fast if not doing a graceful leave
if !c.agent.GetConfig().LeaveOnInt {
return 1
}
// Attempt a graceful leave
// terminateGracefully attempts a graceful leave
func (c *Command) terminateGracefully(signalCh chan os.Signal, sdSock io.Writer) int {
sdNotify(sdSock, sdStopping)
gracefulCh := make(chan struct{})
defer close(gracefulCh)
@@ -1046,14 +1041,26 @@ func (c *Command) handleSignals() int {
}
sdNotify(sdSock, sdReady)
case os.Interrupt, syscall.SIGTERM:
return c.terminate(signalCh, sdSock)
if !c.agent.GetConfig().LeaveOnTerm {
return 1
}
return c.terminateGracefully(signalCh, sdSock)
}
case <-winsvc.ShutdownChannel():
return c.terminate(signalCh, sdSock)
if !c.agent.GetConfig().LeaveOnInt {
return 1
}
return c.terminateGracefully(signalCh, sdSock)
case <-c.ShutdownCh:
return c.terminate(signalCh, sdSock)
if !c.agent.GetConfig().LeaveOnInt {
return 1
}
return c.terminateGracefully(signalCh, sdSock)
case <-c.retryJoinErrCh:
return 1
@@ -1146,7 +1153,7 @@ func (c *Command) handleReload() error {
if err := client.Reload(clientConfig); err != nil {
c.agent.logger.Error("reloading client config failed", "error", err)
return nil
return fmt.Errorf("reloading client config failed: %w", err)
}
}