Merge pull request #1909 from estesp/backport-oom-warn-only

stevvooe · web-flow · commit 2689c9842120 · 2017-12-12T13:05:16.000-06:00
[release/1.0] BACKPORT: server: only warn on failed OOM score adjust
diff --git a/server/server_linux.go b/server/server_linux.go
@@ -19,9 +19,9 @@ func apply(ctx context.Context, config *Config) error {
 		}
 	}
 	if config.OOMScore != 0 {
-		log.G(ctx).Infof("changing OOM score to %d", config.OOMScore)
+		log.G(ctx).Debugf("changing OOM score to %d", config.OOMScore)
 		if err := sys.SetOOMScore(os.Getpid(), config.OOMScore); err != nil {
-			return err
+			log.G(ctx).WithError(err).Errorf("failed to change OOM score to %d", config.OOMScore)
 		}
 	}
 	if config.Cgroup.Path != "" {

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ func apply(ctx context.Context, config *Config) error {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`if config.OOMScore != 0 {`
`22`		`- log.G(ctx).Infof("changing OOM score to %d", config.OOMScore)`
	`22`	`+ log.G(ctx).Debugf("changing OOM score to %d", config.OOMScore)`
`23`	`23`	`if err := sys.SetOOMScore(os.Getpid(), config.OOMScore); err != nil {`
`24`		`- return err`
	`24`	`+ log.G(ctx).WithError(err).Errorf("failed to change OOM score to %d", config.OOMScore)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`if config.Cgroup.Path != "" {`