Skip to content
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

Stop watching SIGTERM before starting process #13

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

Stop watching SIGTERM before starting process #13

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
15 changes: 8 additions & 7 deletions cmd/kubexit/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ func main() {

func waitForBirthDeps(birthDeps []string, namespace, podName string, timeout time.Duration) error {
// Cancel context on SIGTERM to trigger graceful exit
ctx := withCancelOnSignal(context.Background(), syscall.SIGTERM)
ctxParent, parentCancel := withCancelOnSignal(context.Background(), syscall.SIGTERM)

ctx, stopPodWatcher := context.WithTimeout(ctx, timeout)
ctx, stopPodWatcher := context.WithTimeout(ctxParent, timeout)
// Stop pod watcher on exit, if not sooner
defer stopPodWatcher()

Expand All @@ -187,6 +187,7 @@ func waitForBirthDeps(birthDeps []string, namespace, podName string, timeout tim

// Block until all birth deps are ready
<-ctx.Done()
parentCancel()
err = ctx.Err()
if err == context.DeadlineExceeded {
return fmt.Errorf("timed out waiting for birth deps to be ready: %s", timeout)
Expand All @@ -200,7 +201,7 @@ func waitForBirthDeps(birthDeps []string, namespace, podName string, timeout tim
}

// withCancelOnSignal calls cancel when one of the specified signals is recieved.
func withCancelOnSignal(ctx context.Context, signals ...os.Signal) context.Context {
func withCancelOnSignal(ctx context.Context, signals ...os.Signal) (context.Context, context.CancelFunc) {
ctx, cancel := context.WithCancel(ctx)

sigCh := make(chan os.Signal, 1)
Expand All @@ -214,16 +215,16 @@ func withCancelOnSignal(ctx context.Context, signals ...os.Signal) context.Conte
if !ok {
return
}
log.Printf("Received shutdown signal: %v", s)
cancel()
log.Printf("Received shutdown signal: %v, exiting", s)
os.Exit(0)
case <-ctx.Done():
signal.Reset()
close(sigCh)
return
}
}
}()

return ctx
return ctx, cancel
}

// wait for the child to exit and return the exit code
Expand Down