fix: wrong working dir in initd

valyentdev · Jan 18, 2025 · 3436102 · 3436102
1 parent 2f8a243
commit 3436102
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/cluster/placement/types.go b/core/cluster/placement/types.go
@@ -16,11 +16,11 @@ type PlacementResponse struct {
 }
 
 func (r PlacementResponse) GetScore() float64 {
-	cpuUtilization := float64(r.AllocatedAfter.MemoryMB) / float64(r.Allocatable.MemoryMB)
+	cpuUtilization := float64(r.AllocatedAfter.CpusMHz) / float64(r.Allocatable.CpusMHz)
 	memoryUtilization := float64(r.AllocatedAfter.MemoryMB) / float64(r.Allocatable.MemoryMB)
 
-	idealRatio := float64(r.Allocatable.MemoryMB) / float64(r.Allocatable.MemoryMB)
-	currentRatio := float64(r.AllocatedAfter.MemoryMB) / float64(r.AllocatedAfter.MemoryMB)
+	idealRatio := float64(r.Allocatable.MemoryMB) / float64(r.Allocatable.CpusMHz)
+	currentRatio := float64(r.AllocatedAfter.MemoryMB) / float64(r.AllocatedAfter.CpusMHz)
 
 	ratioScore := 1 - (idealRatio-currentRatio)/idealRatio
 

diff --git a/initd/environment/command.go b/initd/environment/command.go
@@ -37,6 +37,11 @@ func buildCommand(cfg initd.Config) (*exec.Cmd, error) {
 		workingDir = *cfg.ImageConfig.WorkingDir
 	}
 
+	err := os.Chdir(workingDir)
+	if err != nil {
+		return nil, fmt.Errorf("error changing working directory: %v", err)
+	}
+
 	lp, err := exec.LookPath(args[0])
 	if err != nil {
 		return nil, fmt.Errorf("error searching for executable: %v", err)
@@ -46,7 +51,6 @@ func buildCommand(cfg initd.Config) (*exec.Cmd, error) {
 		Path:   lp,
 		Args:   args,
 		Env:    envars,
-		Dir:    workingDir,
 		Stdin:  os.Stdin,
 		Stdout: os.Stdout,
 		Stderr: os.Stderr,