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

Abort on timeout, to get stack traces. #6846

Merged
merged 1 commit into from
Feb 15, 2018
Merged

Abort on timeout, to get stack traces. #6846

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
12 changes: 6 additions & 6 deletions kubetest/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ func finishRunning(cmd *exec.Cmd) error {
intLock.Lock()
interrupted = true
intLock.Unlock()
log.Printf("Interrupt after %s timeout during %s. Will terminate in another 15m", timeout, stepName)
log.Printf("Abort after %s timeout during %s. Will terminate in another 15m", timeout, stepName)
terminate.Reset(15 * time.Minute)
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGINT); err != nil {
log.Printf("Failed to interrupt %s. Will terminate immediately: %v", stepName, err)
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGABRT); err != nil {
log.Printf("Failed to abort %s. Will terminate immediately: %v", stepName, err)
syscall.Kill(-cmd.Process.Pid, syscall.SIGTERM)
cmd.Process.Kill()
}
Expand Down Expand Up @@ -287,9 +287,9 @@ func executeParallelCommand(cmd *exec.Cmd, resChan chan cmdExecResult, termChan,
}

case <-intChan:
log.Printf("Interrupt after %s timeout during %s. Will terminate in another 15m", timeout, strings.Join(cmd.Args, " "))
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGINT); err != nil {
log.Printf("Failed to interrupt %s. Will terminate immediately: %v", strings.Join(cmd.Args, " "), err)
log.Printf("Abort after %s timeout during %s. Will terminate in another 15m", timeout, strings.Join(cmd.Args, " "))
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGABRT); err != nil {
log.Printf("Failed to abort %s. Will terminate immediately: %v", strings.Join(cmd.Args, " "), err)
syscall.Kill(-cmd.Process.Pid, syscall.SIGTERM)
cmd.Process.Kill()
}
Expand Down