oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

fix: graceful shutdown of tasks being interrupted by signal

Browse source
This commit is contained in:
Mathieu Fenniak 2025-09-06 18:44:56 -06:00
parent 26fda6e084
commit b2865e5a2d
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/app/cmd/cmd.go
View file

@ -10,7 +10,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/common"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/config" "code.forgejo.org/forgejo/runner/v11/internal/pkg/config"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v11/internal/pkg/ver"
) )
@ -46,7 +45,7 @@ func Execute(ctx context.Context) {
Use: "daemon", Use: "daemon",
Short: "Run as a runner daemon", Short: "Run as a runner daemon",
Args: cobra.MaximumNArgs(1), Args: cobra.MaximumNArgs(1),
RunE: runDaemon(common.WithDaemonContext(ctx, ctx), &configFile), RunE: runDaemon(ctx, &configFile),
} }
rootCmd.AddCommand(daemonCmd) rootCmd.AddCommand(daemonCmd)

16
internal/app/cmd/daemon.go
View file

@ -21,14 +21,22 @@ import (
"code.forgejo.org/forgejo/runner/v11/internal/app/poll" "code.forgejo.org/forgejo/runner/v11/internal/app/poll"
"code.forgejo.org/forgejo/runner/v11/internal/app/run" "code.forgejo.org/forgejo/runner/v11/internal/app/run"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/client" "code.forgejo.org/forgejo/runner/v11/internal/pkg/client"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/common"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/config" "code.forgejo.org/forgejo/runner/v11/internal/pkg/config"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/envcheck" "code.forgejo.org/forgejo/runner/v11/internal/pkg/envcheck"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/labels" "code.forgejo.org/forgejo/runner/v11/internal/pkg/labels"
"code.forgejo.org/forgejo/runner/v11/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v11/internal/pkg/ver"
) )
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { func runDaemon(signalContext context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
return func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, args []string) error {
// signalContext will be 'done' when we receive a graceful shutdown signal; daemonContext is not a derived
// context because we want it to 'outlive' the signalContext in order to perform graceful cleanup.
daemonContext, cancel := context.WithCancel(context.Background())
defer cancel()
ctx := common.WithDaemonContext(daemonContext, daemonContext)
cfg, err := config.LoadDefault(*configFile) cfg, err := config.LoadDefault(*configFile)
if err != nil { if err != nil {
return fmt.Errorf("invalid configuration: %w", err) return fmt.Errorf("invalid configuration: %w", err)
@ -118,13 +126,13 @@ func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command,
go poller.Poll() go poller.Poll()
<-ctx.Done() <-signalContext.Done()
log.Infof("runner: %s shutdown initiated, waiting [runner].shutdown_timeout=%s for running jobs to complete before shutting down", resp.Msg.GetRunner().GetName(), cfg.Runner.ShutdownTimeout) log.Infof("runner: %s shutdown initiated, waiting [runner].shutdown_timeout=%s for running jobs to complete before shutting down", resp.Msg.GetRunner().GetName(), cfg.Runner.ShutdownTimeout)
ctx, cancel := context.WithTimeout(context.Background(), cfg.Runner.ShutdownTimeout) shutdownCtx, cancel := context.WithTimeout(daemonContext, cfg.Runner.ShutdownTimeout)
defer cancel() defer cancel()
err = poller.Shutdown(ctx) err = poller.Shutdown(shutdownCtx)
if err != nil { if err != nil {
log.Warnf("runner: %s cancelled in progress jobs during shutdown", resp.Msg.GetRunner().GetName()) log.Warnf("runner: %s cancelled in progress jobs during shutdown", resp.Msg.GetRunner().GetName())
} }