Skip to content

Commit 7da231b

Browse files
authored
fix: fix error handling to prevent spam in proc prio management (#15071)
1 parent 384873a commit 7da231b

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
@@ -1670,7 +1670,7 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
16701670
}
16711671

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

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy