Merge pull request #30693 from vespa-engine/arnej/warn-about-signal

Arnej/warn about signal

2 files changed, 30 insertions, 2 deletions

diff --git a/client/go/internal/admin/vespa-wrapper/configserver/start.go b/client/go/internal/admin/vespa-wrapper/configserver/start.go
index 7563132ff5a..7e641c0d8ac 100644
--- a/client/go/internal/admin/vespa-wrapper/configserver/start.go
+++ b/client/go/internal/admin/vespa-wrapper/configserver/start.go
@@ -70,8 +70,11 @@ func runConfigserverWithRunserver() int {
 		ServiceName: SERVICE_NAME,
 		Args:        []string{"just-start-configserver"},
 	}
-	rs.Exec("libexec/vespa/vespa-wrapper")
-	return 1
+	if rs.WouldRun() {
+		rs.Exec("libexec/vespa/vespa-wrapper")
+		return 1
+	}
+	return 0
 }
 
 func StartConfigserverEtc() int {
diff --git a/client/go/internal/osutil/run_cmd.go b/client/go/internal/osutil/run_cmd.go
index ca0d621f9f9..3847dcc912a 100644
--- a/client/go/internal/osutil/run_cmd.go
+++ b/client/go/internal/osutil/run_cmd.go
@@ -5,9 +5,11 @@ package osutil
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
+	"syscall"
 
 	"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
 )
@@ -21,6 +23,26 @@ const (
 	SystemCommand
 )
 
+func analyzeError(err error) string {
+	exitErr, wasEe := err.(*exec.ExitError)
+	if !wasEe {
+		return ""
+	}
+	status, wasWs := exitErr.ProcessState.Sys().(syscall.WaitStatus)
+	if !wasWs {
+		return err.Error()
+	}
+	if !status.Signaled() {
+		return ""
+	}
+	msg := "died with signal: " + status.Signal().String()
+	switch status.Signal() {
+	case syscall.SIGILL:
+		msg = msg + " (you probably have an older CPU than required)"
+	}
+	return msg
+}
+
 func (b BackTicks) Run(program string, args ...string) (string, error) {
 	cmd := exec.Command(program, args...)
 	var out bytes.Buffer
@@ -38,5 +60,8 @@ func (b BackTicks) Run(program string, args ...string) (string, error) {
 	}
 	trace.Debug("running command:", program, strings.Join(args, " "))
 	err := cmd.Run()
+	if extraMsg := analyzeError(err); extraMsg != "" {
+		fmt.Fprintln(os.Stderr, "Problem running program", program, "=>", extraMsg)
+	}
 	return out.String(), err
 }