launcher-monitor: Remove dependency on wait

Signed-off-by: L. Pivarc <[email protected]>
cnchef · Feb 22, 2023 · 7f16fb9 · 7f16fb9
1 parent 53a3fce
commit 7f16fb9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/cmd/virt-launcher-monitor/BUILD.bazel b/cmd/virt-launcher-monitor/BUILD.bazel
@@ -10,7 +10,6 @@ go_library(
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/client-go/util/retry:go_default_library",
     ],
 )

diff --git a/cmd/virt-launcher-monitor/virt-launcher-monitor.go b/cmd/virt-launcher-monitor/virt-launcher-monitor.go
@@ -36,7 +36,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/net"
 
 	"github.com/spf13/pflag"
-	utilwait "k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 
 	"kubevirt.io/client-go/log"
@@ -166,15 +165,28 @@ func RunAndMonitor(containerDiskDir string) (int, error) {
 		}
 
 		// Wait for 10 seconds for the qemu process to disappear
-		err = utilwait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
-			pid, _ := findPid(qemuProcessCommandPrefix)
-			if pid == 0 {
-				return true, nil
+		timeout := time.After(10 * time.Second)
+		ticker := time.NewTicker(time.Second)
+		defer ticker.Stop()
+		period := make(chan struct{}, 1)
+
+		go func() {
+			period <- struct{}{}
+			for range ticker.C {
+				period <- struct{}{}
+			}
+		}()
+
+		for {
+			select {
+			case <-timeout:
+				return 1, err
+			case <-period:
+				pid, _ := findPid(qemuProcessCommandPrefix)
+				if pid == 0 {
+					return exitCode, nil
+				}
 			}
-			return false, nil
-		})
-		if err != nil {
-			return 1, err
 		}
 	}
 	return exitCode, nil

diff --git a/staging/src/kubevirt.io/client-go/log/BUILD.bazel b/staging/src/kubevirt.io/client-go/log/BUILD.bazel
@@ -27,7 +27,6 @@ go_test(
         "//vendor/github.com/onsi/ginkgo/v2:go_default_library",
         "//vendor/github.com/onsi/ginkgo/v2/reporters:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
     ],
 )