generate: do not set OOMScoreAdj if no adjustment

samuelkarp · samuelkarp · commit b5fc359973c0 · 2024-10-23T13:20:20.000-07:00
Existing OOMScoreAdj on the incoming spec should not be cleared. Fixes #117 Signed-off-by: Samuel Karp <samuelkarp@google.com>
diff --git a/pkg/runtime-tools/generate/generate.go b/pkg/runtime-tools/generate/generate.go
@@ -329,9 +329,6 @@ func (g *Generator) AdjustCgroupsPath(path string) {
 func (g *Generator) AdjustOomScoreAdj(score *nri.OptionalInt) {
 	if score != nil {
 		g.SetProcessOOMScoreAdj(int(score.Value))
-	} else {
-		g.SetProcessOOMScoreAdj(0)
-		g.Config.Process.OOMScoreAdj = nil
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -329,9 +329,6 @@ func (g *Generator) AdjustCgroupsPath(path string) {`
`329`	`329`	`func (g Generator) AdjustOomScoreAdj(score nri.OptionalInt) {`
`330`	`330`	`if score != nil {`
`331`	`331`	`g.SetProcessOOMScoreAdj(int(score.Value))`
`332`		`- } else {`
`333`		`- g.SetProcessOOMScoreAdj(0)`
`334`		`- g.Config.Process.OOMScoreAdj = nil`
`335`	`332`	`}`
`336`	`333`	`}`
`337`	`334`