Skip to content

K
k3s
Commit e5e7b60e authored by Bryan Boreham's avatar Bryan Boreham Committed by Bryan Boreham
Browse files
Options

Remove Pdeathsig code because it doesn't do what was intended

Pdeathsig is applied to the process we are starting, so that will get killed if the e2e_node process dies, which isn't what we need.
parent a8d7e93d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 13 deletions
test/e2e_node/e2e_service.go
View file @ e5e7b60e
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
"os/exec" "os/exec"
"path" "path"
"path/filepath" "path/filepath"
"reflect"
"strconv" "strconv"
"strings" "strings"
"syscall" "syscall"
...@@ -284,18 +283,6 @@ func (es *e2eService) startServer(cmd *healthCheckCommand) error { ...@@ -284,18 +283,6 @@ 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.
attrs := &syscall.SysProcAttr{}
// Hack to set linux-only field without build tags.
deathSigField := reflect.ValueOf(attrs).Elem().FieldByName("Pdeathsig")
if deathSigField.IsValid() {
deathSigField.Set(reflect.ValueOf(syscall.SIGKILL))
} else {
cmdErrorChan <- fmt.Errorf("Failed to set Pdeathsig field (non-linux build)")
return
}
cmd.Cmd.SysProcAttr = attrs
// Run the command // Run the command
err = cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment