Change MemoryCapacity to StorageCapacity to be more accurate

kubernetes · Aug 21, 2020 · 44b93f4 · 44b93f4
1 parent 4fcffca
commit 44b93f4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23 deletions.
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
@@ -322,7 +322,7 @@ func nodeStatus(api libmachine.API, cc config.ClusterConfig, n config.Node) (*St
 	}
 
 	// Check storage
-	p, err := machine.MemoryCapacity(cr, "/var")
+	p, err := machine.StorageCapacity(cr, "/var")
 	if err != nil {
 		glog.Errorf("failed to get memory capacity of /var: %v", err)
 		st.Host = state.Error.String()

diff --git a/cmd/minikube/cmd/test b/cmd/minikube/cmd/test
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
@@ -72,8 +72,8 @@ const (
 	MinikubeActivePodmanEnv = "MINIKUBE_ACTIVE_PODMAN"
 	// MinikubeForceSystemdEnv is used to force systemd as cgroup manager for the container runtime
 	MinikubeForceSystemdEnv = "MINIKUBE_FORCE_SYSTEMD"
-	// TestMemoryCapacityEnv is used in integration tests for insufficient storage with 'minikube status'
-	TestMemoryCapacityEnv = "MINIKUBE_TEST_MEMORY_CAPACITY"
+	// TestStorageCapacityEnv is used in integration tests for insufficient storage with 'minikube status'
+	TestStorageCapacityEnv = "MINIKUBE_TEST_STORAGE_CAPACITY"
 )
 
 var (

diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
@@ -218,7 +218,7 @@ func postStartValidations(h *host.Host, drvName string) {
 		glog.Warningf("error getting command runner: %v", err)
 	}
 	// make sure /var isn't full, otherwise warn
-	percentageFull, err := MemoryCapacity(r, "/var")
+	percentageFull, err := StorageCapacity(r, "/var")
 	if err != nil {
 		glog.Warningf("error getting percentage of /var that is free: %v", err)
 	}
@@ -231,9 +231,9 @@ func postStartValidations(h *host.Host, drvName string) {
 	}
 }
 
-// MemoryCapacity returns the capacity of dir in the VM/container
-func MemoryCapacity(cr command.Runner, dir string) (int, error) {
-	if s := os.Getenv(constants.TestMemoryCapacityEnv); s != "" {
+// StorageCapacity returns the capacity of dir in the VM/container as a percentage
+func StorageCapacity(cr command.Runner, dir string) (int, error) {
+	if s := os.Getenv(constants.TestStorageCapacityEnv); s != "" {
 		return strconv.Atoi(s)
 	}
 	output, err := cr.RunCmd(exec.Command("sh", "-c", fmt.Sprintf("df -h %s | awk 'NR==2{print $5}'", dir)))

diff --git a/test/integration/status_test.go b/test/integration/status_test.go
@@ -44,7 +44,7 @@ func TestInsufficientStorage(t *testing.T) {
 	startArgs = append(startArgs, StartArgs()...)
 	c := exec.CommandContext(ctx, Target(), startArgs...)
 	// artificially set /var to 100% capacity
-	c.Env = append(os.Environ(), fmt.Sprintf("%s=100", constants.TestMemoryCapacityEnv))
+	c.Env = append(os.Environ(), fmt.Sprintf("%s=100", constants.TestStorageCapacityEnv))
 
 	rr, err := Run(t, c)
 	if err == nil {
@@ -69,7 +69,7 @@ func runStatusCmd(ctx context.Context, t *testing.T, profile string) []byte {
 	// make sure minikube status shows insufficient storage
 	c := exec.CommandContext(ctx, Target(), "status", "-p", profile, "--output=json", "--layout=cluster", "--alsologtostderr")
 	// artificially set /var to 100% capacity
-	c.Env = append(os.Environ(), fmt.Sprintf("%s=100", constants.TestMemoryCapacityEnv))
+	c.Env = append(os.Environ(), fmt.Sprintf("%s=100", constants.TestStorageCapacityEnv))
 	rr, err := Run(t, c)
 	// status exits non-0 if status isn't Running
 	if err == nil {