github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Send SIGTERM on Pdeathsig to allow child to clean up

Browse Source 
Also fix the comment to better describe the effect of this code.
This commit is contained in:
Bryan Boreham 2016-08-04 15:12:29 +01:00 committed by Bryan Boreham
parent ba17bac843
commit bd8f4ff8cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/e2e_service.go
View File

@ -295,12 +295,12 @@ func (es *e2eService) startServer(cmd *healthCheckCommand) error {
cmd.Cmd.Stdout = outfile cmd.Cmd.Stdout = outfile
cmd.Cmd.Stderr = outfile cmd.Cmd.Stderr = outfile
// Killing the sudo command should kill the server as well. // Death of this test process should kill the server as well.
attrs := &syscall.SysProcAttr{} attrs := &syscall.SysProcAttr{}
// Hack to set linux-only field without build tags. // Hack to set linux-only field without build tags.
deathSigField := reflect.ValueOf(attrs).Elem().FieldByName("Pdeathsig") deathSigField := reflect.ValueOf(attrs).Elem().FieldByName("Pdeathsig")
if deathSigField.IsValid() { if deathSigField.IsValid() {
deathSigField.Set(reflect.ValueOf(syscall.SIGKILL)) deathSigField.Set(reflect.ValueOf(syscall.SIGTERM))
} else { } else {
cmdErrorChan <- fmt.Errorf("Failed to set Pdeathsig field (non-linux build)") cmdErrorChan <- fmt.Errorf("Failed to set Pdeathsig field (non-linux build)")
return return