fix: suppress benign errors when listing processes (#14660)

sreya · web-flow · commit bfdc29f46624 · 2024-09-12T23:00:04.000+01:00
diff --git a/agent/agent.go b/agent/agent.go
@@ -1676,16 +1676,12 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
 		}
 
 		score, niceErr := proc.Niceness(a.syscaller)
-		if niceErr != nil && !xerrors.Is(niceErr, os.ErrPermission) {
-			if !isNoSuchProcessErr(niceErr) {
-				debouncer.Warn(ctx, "unable to get proc niceness",
-					slog.F("cmd", proc.Cmd()),
-					slog.F("pid", proc.PID),
-					slog.Error(niceErr),
-				)
-			}
-
-			continue
+		if !isBenignProcessErr(niceErr) {
+			debouncer.Warn(ctx, "unable to get proc niceness",
+				slog.F("cmd", proc.Cmd()),
+				slog.F("pid", proc.PID),
+				slog.Error(niceErr),
+			)
 		}
 
 		// We only want processes that don't have a nice value set
@@ -1699,31 +1695,27 @@ func (a *agent) manageProcessPriority(ctx context.Context, debouncer *logDebounc
 
 		if niceErr == nil {
 			err := proc.SetNiceness(a.syscaller, niceness)
-			if err != nil && !xerrors.Is(err, os.ErrPermission) {
-				if !isNoSuchProcessErr(err) {
-					debouncer.Warn(ctx, "unable to set proc niceness",
-						slog.F("cmd", proc.Cmd()),
-						slog.F("pid", proc.PID),
-						slog.F("niceness", niceness),
-						slog.Error(err),
-					)
-				}
+			if !isBenignProcessErr(err) {
+				debouncer.Warn(ctx, "unable to set proc niceness",
+					slog.F("cmd", proc.Cmd()),
+					slog.F("pid", proc.PID),
+					slog.F("niceness", niceness),
+					slog.Error(err),
+				)
 			}
 		}
 
 		// If the oom score is valid and it's not already set and isn't a custom value set by another process then it's ok to update it.
 		if oomScore != unsetOOMScore && oomScore != proc.OOMScoreAdj && !isCustomOOMScore(agentScore, proc) {
 			oomScoreStr := strconv.Itoa(oomScore)
 			err := afero.WriteFile(a.filesystem, fmt.Sprintf("/proc/%d/oom_score_adj", proc.PID), []byte(oomScoreStr), 0o644)
-			if err != nil && !xerrors.Is(err, os.ErrPermission) {
-				if !isNoSuchProcessErr(err) {
-					debouncer.Warn(ctx, "unable to set oom_score_adj",
-						slog.F("cmd", proc.Cmd()),
-						slog.F("pid", proc.PID),
-						slog.F("score", oomScoreStr),
-						slog.Error(err),
-					)
-				}
+			if !isBenignProcessErr(err) {
+				debouncer.Warn(ctx, "unable to set oom_score_adj",
+					slog.F("cmd", proc.Cmd()),
+					slog.F("pid", proc.PID),
+					slog.F("score", oomScoreStr),
+					slog.Error(err),
+				)
 			}
 		}
 		modProcs = append(modProcs, proc)
@@ -2154,6 +2146,13 @@ func (l *logDebouncer) log(ctx context.Context, level slog.Level, msg string, fi
 	l.messages[msg] = time.Now()
 }
 
+func isBenignProcessErr(err error) bool {
+	return err != nil &&
+		(xerrors.Is(err, os.ErrNotExist) ||
+			xerrors.Is(err, os.ErrPermission) ||
+			isNoSuchProcessErr(err))
+}
+
 func isNoSuchProcessErr(err error) bool {
 	return err != nil && strings.Contains(err.Error(), "no such process")
 }
diff --git a/agent/agentproc/proc_unix.go b/agent/agentproc/proc_unix.go
@@ -45,16 +45,15 @@ func List(fs afero.Fs, syscaller Syscaller) ([]*Process, error) {
 
 		cmdline, err := afero.ReadFile(fs, filepath.Join(defaultProcDir, entry, "cmdline"))
 		if err != nil {
-			var errNo syscall.Errno
-			if xerrors.As(err, &errNo) && errNo == syscall.EPERM {
+			if isBenignError(err) {
 				continue
 			}
 			return nil, xerrors.Errorf("read cmdline: %w", err)
 		}
 
 		oomScore, err := afero.ReadFile(fs, filepath.Join(defaultProcDir, entry, "oom_score_adj"))
 		if err != nil {
-			if xerrors.Is(err, os.ErrPermission) {
+			if isBenignError(err) {
 				continue
 			}
 
@@ -124,3 +123,12 @@ func (p *Process) Cmd() string {
 func (p *Process) cmdLine() []string {
 	return strings.Split(p.CmdLine, "\x00")
 }
+
+func isBenignError(err error) bool {
+	var errno syscall.Errno
+	if !xerrors.As(err, &errno) {
+		return false
+	}
+
+	return errno == syscall.ESRCH || errno == syscall.EPERM || xerrors.Is(err, os.ErrNotExist)
+}
