Skip to content

[PROTOTYPE] Inform agent-shutdown hook of reason for agent shutdown. #3315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[PROTOTYPE] Inform agent-shutdown hook of reason for agent shutdown. #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions agent/agent_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"io"
"math/rand/v2"
"net/http"
"os"
"sync"
"time"

Expand Down Expand Up @@ -424,6 +425,7 @@ func (a *AgentWorker) runPingLoop(ctx context.Context, idleMonitor *IdleMonitor)
// But only terminate if everyone else is also idle
if idleMonitor.Idle() {
a.logger.Info("All agents have been idle for %v. Disconnecting...", disconnectAfterIdleTimeout)
os.Setenv("BUILDKITE_AGENT_SHUTDOWN_REASON", "IDLE")
return nil
}
a.logger.Debug("Agent has been idle for %.f seconds, but other agents haven't",
Expand Down
8 changes: 8 additions & 0 deletions clicommand/agent_start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,9 +1377,17 @@ func handlePoolSignals(ctx context.Context, l logger.Logger, pool *agent.AgentPo
switch sig {
case syscall.SIGQUIT:
l.Debug("Received signal `%s`", sig.String())
os.Setenv("BUILDKITE_AGENT_SHUTDOWN_REASON", "SIGNAL")
os.Setenv("BUILDKITE_AGENT_SHUTDOWN_SIGNAL", "SIGQUIT")
pool.Stop(false)
case syscall.SIGTERM, syscall.SIGINT:
l.Debug("Received signal `%s`", sig.String())
os.Setenv("BUILDKITE_AGENT_SHUTDOWN_REASON", "SIGNAL")
if sig == syscall.SIGTERM {
os.Setenv("BUILDKITE_AGENT_SHUTDOWN_SIGNAL", "SIGTERM")
} else {
os.Setenv("BUILDKITE_AGENT_SHUTDOWN_SIGNAL", "SIGINT")
}
if interruptCount == 0 {
interruptCount++
l.Info("Received CTRL-C, send again to forcefully kill the agent(s)")
Expand Down