test

Author: ComradeProgrammer

hack/prow/common.sh

@@ -176,6 +176,7 @@ echo $PATH
 gotestsum --jsonfile "${JSON_OUT}" --junitfile="${JUNIT_OUT}" -f standard-verbose --raw-command -- \
 	go tool test2json -t \
 	${E2E_BIN} \
+	-test.run TestScheduledStopUnix \
 	-minikube-start-args="--driver=${DRIVER} ${EXTRA_START_ARGS}" \
 	-test.timeout=${TIMEOUT} -test.v \
 	${EXTRA_TEST_ARGS} \

out.txt

@@ -0,0 +1 @@
+go build  -tags "libvirt_dlopen" -ldflags="-X k8s.io/minikube/pkg/version.version=v1.37.0 -X k8s.io/minikube/pkg/version.isoVersion=v1.37.0-1762018871-21834 -X k8s.io/minikube/pkg/version.gitCommitID="8f3cadfdfdc7d39f951f3d645b177c153316cc08-dirty" -X k8s.io/minikube/pkg/version.storageProvisionerVersion=v5" -o out/minikube k8s.io/minikube/cmd/minikube

pkg/minikube/schedule/daemonize_unix.go

@@ -21,7 +21,9 @@ package schedule
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"strconv"
+	"syscall"
 	"time"
 
 	"github.com/VividCortex/godaemon"
@@ -38,11 +40,13 @@ import (
 func KillExisting(profiles []string, options *run.CommandOptions) {
 	for _, profile := range profiles {
 		if err := killPIDForProfile(profile); err != nil {
+			fmt.Printf("error killing PID for profile %s: %v\n", profile, err)
 			klog.Warningf("error killng PID for profile %s: %v", profile, err)
 		}
 		_, cc := mustload.Partial(profile, options)
 		cc.ScheduledStop = nil
 		if err := config.SaveProfile(profile, cc); err != nil {
+			fmt.Printf("error saving profile for profile %s: %v\n", profile, err)
 			klog.Errorf("error saving profile for profile %s: %v", profile, err)
 		}
 	}
@@ -71,9 +75,28 @@ func killPIDForProfile(profile string) error {
 		return errors.Wrap(err, "finding process")
 	}
 	klog.Infof("killing process %v as it is an old scheduled stop", pid)
+
 	if err := p.Kill(); err != nil {
+		klog.Errorf("error killing %v: %v", pid, err)
+		fmt.Printf("error killing %v: %v\n", pid, err)
 		return errors.Wrapf(err, "killing %v", pid)
 	}
+	for i := 0; i < 50; i++ {
+		err := p.Signal(syscall.Signal(0))
+		if err != nil {
+			klog.Infof("process %v has exited", pid)
+			fmt.Printf("process %v has exited\n", pid)
+			return nil
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+	cmd := exec.Command("ps", "--format","pid,ppid,user,stat,%cpu,%mem,cmd")
+
+    cmd.Stdout = os.Stdout
+    cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		fmt.Println("error running ps:", err)
+	}
 	return nil
 }
 

test/integration/scheduled_stop_test.go

@@ -93,7 +93,7 @@ func TestScheduledStopUnix(t *testing.T) {
 	}
 
 	// schedule a second stop which should cancel the first scheduled stop
-	stopMinikube(ctx, t, profile, []string{"--schedule", "15s"})
+	stopMinikube(ctx, t, profile, []string{"--schedule", "15s", "-v=5", "--alsologtostderr"})
 	if processRunning(t, pid) {
 		t.Fatalf("process %v running but should have been killed on reschedule of stop", pid)
 	}
@@ -138,6 +138,9 @@ func stopMinikube(ctx context.Context, t *testing.T, profile string, additionalA
 	if err != nil {
 		t.Fatalf("stopping minikube: %v\n%s", err, rr.Output())
 	}
+	fmt.Println("minikube stop output:")
+	fmt.Println(rr.Output())
+
 }
 
 func checkPID(t *testing.T, profile string) string {
@@ -167,7 +170,17 @@ func processRunning(t *testing.T, pid string) bool {
 	}
 	err = process.Signal(syscall.Signal(0))
 	t.Log("signal error was: ", err)
-	return err == nil
+	if err != nil {
+		return false
+	}
+	// then check if this process has become a zombie process
+	// which is also not running
+	data, _ := os.ReadFile(fmt.Sprintf("/proc/%s/status", pid))
+	if strings.Contains(string(data), "State:\tZ") {
+		t.Logf("process %s is a zombie", pid)
+		return false
+	}
+	return true
 }
 func ensureMinikubeStatus(ctx context.Context, t *testing.T, profile, key string, wantStatus string) {
 	checkStatus := func() error {