Skip to content

Commit c9c90c4

Browse files
authored
fix: fix error handling to prevent spam in proc prio management (#15071) (#15095)
1 parent 6f68315 commit c9c90c4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

agent/agent.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
16691669
}
16701670

16711671
score, niceErr := proc.Niceness(a.syscaller)
1672-
if !isBenignProcessErr(niceErr) {
1672+
if niceErr != nil && !isBenignProcessErr(niceErr) {
16731673
debouncer.Warn(ctx, "unable to get proc niceness",
16741674
slog.F("cmd", proc.Cmd()),
16751675
slog.F("pid", proc.PID),
@@ -1688,7 +1688,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
16881688

16891689
if niceErr == nil {
16901690
err := proc.SetNiceness(a.syscaller, niceness)
1691-
if !isBenignProcessErr(err) {
1691+
if err != nil && !isBenignProcessErr(err) {
16921692
debouncer.Warn(ctx, "unable to set proc niceness",
16931693
slog.F("cmd", proc.Cmd()),
16941694
slog.F("pid", proc.PID),
@@ -1702,7 +1702,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
17021702
if oomScore != unsetOOMScore && oomScore != proc.OOMScoreAdj && !isCustomOOMScore(agentScore, proc) {
17031703
oomScoreStr := strconv.Itoa(oomScore)
17041704
err := afero.WriteFile(a.filesystem, fmt.Sprintf("/proc/%d/oom_score_adj", proc.PID), []byte(oomScoreStr), 0o644)
1705-
if !isBenignProcessErr(err) {
1705+
if err != nil && !isBenignProcessErr(err) {
17061706
debouncer.Warn(ctx, "unable to set oom_score_adj",
17071707
slog.F("cmd", proc.Cmd()),
17081708
slog.F("pid", proc.PID),

0 commit comments

Comments
 (0)