Skip to content

Commit 5133315

Browse files
authored
fix: fix error handling to prevent spam in proc prio management (#15071) (#15098)
1 parent 683a720 commit 5133315

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

agent/agent.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
16741674
}
16751675

16761676
score, niceErr := proc.Niceness(a.syscaller)
1677-
if !isBenignProcessErr(niceErr) {
1677+
if niceErr != nil && !isBenignProcessErr(niceErr) {
16781678
debouncer.Warn(ctx, "unable to get proc niceness",
16791679
slog.F("cmd", proc.Cmd()),
16801680
slog.F("pid", proc.PID),
@@ -1693,7 +1693,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
16931693

16941694
if niceErr == nil {
16951695
err := proc.SetNiceness(a.syscaller, niceness)
1696-
if !isBenignProcessErr(err) {
1696+
if err != nil && !isBenignProcessErr(err) {
16971697
debouncer.Warn(ctx, "unable to set proc niceness",
16981698
slog.F("cmd", proc.Cmd()),
16991699
slog.F("pid", proc.PID),
@@ -1707,7 +1707,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
17071707
if oomScore != unsetOOMScore && oomScore != proc.OOMScoreAdj && !isCustomOOMScore(agentScore, proc) {
17081708
oomScoreStr := strconv.Itoa(oomScore)
17091709
err := afero.WriteFile(a.filesystem, fmt.Sprintf("/proc/%d/oom_score_adj", proc.PID), []byte(oomScoreStr), 0o644)
1710-
if !isBenignProcessErr(err) {
1710+
if err != nil && !isBenignProcessErr(err) {
17111711
debouncer.Warn(ctx, "unable to set oom_score_adj",
17121712
slog.F("cmd", proc.Cmd()),
17131713
slog.F("pid", proc.PID),

0 commit comments

Comments
 (0)