Mac/Windows: Check if daemon able to serve after it starts

This PR add time limit (15 sec) to make sure daemon able to serve the requests after it is start because sometimes just after start it takes time to serve. fixes: crc-org#3148
praveenkumar · Apr 26, 2022 · 49e748e · 49e748e
1 parent e5c608f
commit 49e748e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/pkg/crc/preflight/preflight_checks_nonlinux.go b/pkg/crc/preflight/preflight_checks_nonlinux.go
@@ -4,10 +4,13 @@
 package preflight
 
 import (
+	"context"
 	"runtime"
 	"strings"
+	"time"
 
 	"github.com/code-ready/crc/pkg/crc/daemonclient"
+	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
 	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/shirou/gopsutil/v3/process"
 )
@@ -70,3 +73,13 @@ func olderDaemonVersionRunning() error {
 	}
 	return daemonclient.CheckIfOlderVersion(v)
 }
+
+func checkIfDaemonIsServing() error {
+	return crcerrors.Retry(context.Background(), 15*time.Second, func() error {
+		_, err := daemonclient.GetVersionFromDaemonAPI()
+		if err != nil {
+			return &crcerrors.RetriableError{Err: err}
+		}
+		return err
+	}, 2*time.Second)
+}
diff --git a/pkg/crc/preflight/preflight_darwin.go b/pkg/crc/preflight/preflight_darwin.go
@@ -109,6 +109,13 @@ var daemonLaunchdChecks = []Check{
 		cleanupDescription: "Unloading and removing the daemon plist file",
 		cleanup:            removeDaemonPlistFile,
 	},
+	{
+		configKeySuffix:  "check-daemon-is-serving",
+		checkDescription: "Checking if crc daemon is serving the requests",
+		check:            checkIfDaemonIsServing,
+		fixDescription:   "crc daemon is not serving to the requests",
+		flags:            NoFix,
+	},
 }
 
 // We want all preflight checks including

diff --git a/pkg/crc/preflight/preflight_darwin_test.go b/pkg/crc/preflight/preflight_darwin_test.go
@@ -13,13 +13,13 @@ import (
 func TestCountConfigurationOptions(t *testing.T) {
 	cfg := config.New(config.NewEmptyInMemoryStorage())
 	RegisterSettings(cfg)
-	assert.Len(t, cfg.AllConfigs(), 14)
+	assert.Len(t, cfg.AllConfigs(), 15)
 }
 
 func TestCountPreflights(t *testing.T) {
-	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
-	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
+	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 20)
+	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 20)
 
-	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
-	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
+	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
+	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
 }
diff --git a/pkg/crc/preflight/preflight_windows.go b/pkg/crc/preflight/preflight_windows.go
@@ -133,6 +133,13 @@ var daemonTaskChecks = []Check{
 
 		labels: labels{Os: Windows},
 	},
+	{
+		configKeySuffix:  "check-daemon-is-serving",
+		checkDescription: "Checking if crc daemon is serving the requests",
+		check:            checkIfDaemonIsServing,
+		fixDescription:   "crc daemon is not serving to the requests",
+		flags:            NoFix,
+	},
 }
 
 var adminHelperServiceCheks = []Check{
@@ -142,7 +149,6 @@ var adminHelperServiceCheks = []Check{
 		check:            checkIfAdminHelperServiceRunning,
 		fixDescription:   "Make sure you installed the crc using installer",
 		flags:            NoFix,
-
 		labels: labels{Os: Windows},
 	},
 }

diff --git a/pkg/crc/preflight/preflight_windows_test.go b/pkg/crc/preflight/preflight_windows_test.go
@@ -13,13 +13,13 @@ import (
 func TestCountConfigurationOptions(t *testing.T) {
 	cfg := config.New(config.NewEmptyInMemoryStorage())
 	RegisterSettings(cfg)
-	assert.Len(t, cfg.AllConfigs(), 12)
+	assert.Len(t, cfg.AllConfigs(), 13)
 }
 
 func TestCountPreflights(t *testing.T) {
-	assert.Len(t, getPreflightChecks(false, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
-	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
+	assert.Len(t, getPreflightChecks(false, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
+	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 19)
 
-	assert.Len(t, getPreflightChecks(false, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 17)
-	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 17)
+	assert.Len(t, getPreflightChecks(false, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
+	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 18)
 }