testserver: use SIGTERM instead of SIGKILL during upgrade

rafiss · rafiss · commit d465a5661533 · 2023-03-10T11:08:17.000-05:00
This makes it shutdown gracefully instead of abruptly.
diff --git a/testserver/testservernode.go b/testserver/testservernode.go
@@ -19,6 +19,7 @@ import (
 	"log"
 	"os/exec"
 	"strings"
+	"syscall"
 )
 
 func (ts *testServerImpl) StopNode(nodeNum int) error {
@@ -29,7 +30,7 @@ func (ts *testServerImpl) StopNode(nodeNum int) error {
 
 	// Kill the process.
 	if cmd.Process != nil {
-		if err := cmd.Process.Kill(); err != nil {
+		if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {
 			return err
 		}
 		if _, err := cmd.Process.Wait(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`"log"`
`20`	`20`	`"os/exec"`
`21`	`21`	`"strings"`
	`22`	`+ "syscall"`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`func (ts *testServerImpl) StopNode(nodeNum int) error {`
`@@ -29,7 +30,7 @@ func (ts *testServerImpl) StopNode(nodeNum int) error {`
`29`	`30`
`30`	`31`	`// Kill the process.`
`31`	`32`	`if cmd.Process != nil {`
`32`		`- if err := cmd.Process.Kill(); err != nil {`
	`33`	`+ if err := cmd.Process.Signal(syscall.SIGTERM); err != nil {`
`33`	`34`	`return err`
`34`	`35`	`}`
`35`	`36`	`if _, err := cmd.Process.Wait(); err != nil {`