feat: Increase default cpu and memory to 1/2 of system cpu and memory (runfinch#1563)

Signed-off-by: Shubhranshu Mahapatra <[email protected]>

Author: Shubhranshu153

pkg/config/config_darwin_test.go

@@ -87,7 +87,7 @@ cpus: 8
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want:    makeConfig("vz", "3GiB", 2, false),
+			want:    makeConfig("vz", "6GiB", 2, false),
 			wantErr: nil,
 		},
 		{
@@ -129,7 +129,7 @@ cpus: 8
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want:    makeConfig("vz", "3GiB", 2, false),
+			want:    makeConfig("vz", "6GiB", 2, false),
 			wantErr: nil,
 		},
 		{
@@ -150,7 +150,7 @@ cpus: 8
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want:    makeExperimentalConfig("vz", "3GiB", 2, false, SharedExperimentalSettings{MountInotify: true}),
+			want:    makeExperimentalConfig("vz", "6GiB", 2, false, SharedExperimentalSettings{MountInotify: true}),
 			wantErr: nil,
 		},
 		{
@@ -171,7 +171,7 @@ cpus: 8
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want:    makeConfig("vz", "3GiB", 2, false),
+			want:    makeConfig("vz", "6GiB", 2, false),
 			wantErr: nil,
 		},
 	}

pkg/config/defaults_darwin.go

@@ -39,7 +39,7 @@ func rosettaDefault(cfg *Finch) {
 
 func memoryDefault(cfg *Finch, mem fmemory.Memory) {
 	if cfg.Memory == nil {
-		defaultMemory := math.Round(float64(mem.TotalMemory()) * 0.25)
+		defaultMemory := math.Round(float64(mem.TotalMemory()) * 0.5)
 		if defaultMemory >= fallbackMemory {
 			cfg.Memory = pointer.String(units.BytesSize(defaultMemory))
 		} else {
@@ -50,7 +50,7 @@ func memoryDefault(cfg *Finch, mem fmemory.Memory) {
 
 func cpuDefault(cfg *Finch, deps LoadSystemDeps) {
 	if cfg.CPUs == nil {
-		defaultCPUs := int(math.Round(float64(deps.NumCPU()) * 0.25))
+		defaultCPUs := int(math.Round(float64(deps.NumCPU()) * 0.5))
 		if defaultCPUs >= fallbackCPUs {
 			cfg.CPUs = pointer.Int(defaultCPUs)
 		} else {

pkg/config/defaults_darwin_test.go

@@ -42,7 +42,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want: makeConfig("vz", "3GiB", 2, false),
+			want: makeConfig("vz", "6GiB", 4, false),
 		},
 		{
 			name: "fills CPUs with default when unset",
@@ -62,7 +62,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want: makeConfig("vz", "4GiB", 2, false),
+			want: makeConfig("vz", "4GiB", 4, false),
 		},
 		{
 			name: "fills memory with default when unset",
@@ -83,7 +83,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want: makeConfig("vz", "3GiB", 6, false),
+			want: makeConfig("vz", "6GiB", 6, false),
 		},
 		{
 			name: "fills with fallbacks when defaults are too low",
@@ -94,7 +94,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc *mocks.CommandCreator,
 				ctrl *gomock.Controller,
 			) {
-				deps.EXPECT().NumCPU().Return(4)
+				deps.EXPECT().NumCPU().Return(3)
 				// 1,073,741,824 == 1GiB
 				mem.EXPECT().TotalMemory().Return(uint64(1_073_741_824))
 				c := mocks.NewCommand(ctrl)
@@ -125,7 +125,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("14.0.0"), nil)
 			},
-			want: makeConfig("qemu", "3GiB", 2, false),
+			want: makeConfig("qemu", "6GiB", 4, false),
 		},
 		{
 			name: "falls back to qemu on old versions",
@@ -143,7 +143,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("12.0.0"), nil)
 			},
-			want: makeConfig("qemu", "3GiB", 2, false),
+			want: makeConfig("qemu", "6GiB", 4, false),
 		},
 		{
 			name: "falls back to qemu if there's an error",
@@ -161,7 +161,7 @@ func applyDefaultPlatformSpecificTestCases() applyDefaultTestCases {
 				ecc.EXPECT().Create("sw_vers", "-productVersion").Return(c)
 				c.EXPECT().Output().Return([]byte("12.0.0"), fmt.Errorf("an error"))
 			},
-			want: makeConfig("qemu", "3GiB", 2, false),
+			want: makeConfig("qemu", "6GiB", 4, false),
 		},
 	}
 }