Fix cpu.shares content parsing (#321)

Fix cpu.shares content parsing
palantir · Apr 3, 2023 · 41d9844 · 41d9844
1 parent ce89fb7
commit 41d9844
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/changelog/@unreleased/pr-321.v2.yml b/changelog/@unreleased/pr-321.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Fix cpu.shares content parsing
+  links:
+  - https://github.com/palantir/go-java-launcher/pull/321
diff --git a/launchlib/processors.go b/launchlib/processors.go
@@ -67,7 +67,7 @@ func (c CGroupV1ProcessorCounter) ProcessorCount() (uint, error) {
 	if err != nil {
 		return 0, errors.Wrapf(err, "unable to read cpu.shares")
 	}
-	cpuShares, err := strconv.Atoi(string(cpuShareBytes))
+	cpuShares, err := strconv.Atoi(strings.TrimSpace(string(cpuShareBytes)))
 	if err != nil {
 		return 0, errors.New("unable to convert cpu.shares value to expected type")
 	}

diff --git a/launchlib/processors_test.go b/launchlib/processors_test.go
@@ -88,8 +88,8 @@ var (
 3473 5088 0:435 / /proc/scsi ro,relatime - tmpfs tmpfs ro
 3474 5092 0:436 / /sys/firmware ro,relatime - tmpfs tmpfs ro`)
 
-	lowCPUSharesContent  = []byte(`100`)
-	highCPUSharesContent = []byte(`10000`)
+	lowCPUSharesContent  = []byte("100\n")
+	highCPUSharesContent = []byte("10000\n")
 	badCPUSharesContent  = []byte(``)
 )