remove oom_score_adj

coder · sreya · Sep 15, 2023 · Aug 30, 2023 · Aug 31, 2023 · Aug 31, 2023
commit d132480a017450421d2ea0e6357e6c444b914996
diff --git a/agent/agent.go b/agent/agent.go
@@ -1327,8 +1327,7 @@ func (a *agent) manageProcessPriorityLoop(ctx context.Context) {
 
 func (a *agent) manageProcessPriority(ctx context.Context) ([]*agentproc.Process, error) {
 	const (
-		niceness    = 10
-		oomScoreAdj = -500
+		niceness = 10
 	)
 
 	procs, err := agentproc.List(a.filesystem, a.syscaller)
@@ -1351,18 +1350,10 @@ func (a *agent) manageProcessPriority(ctx context.Context) ([]*agentproc.Process
 			contains := strings.Contains(proc.Cmd(), e)
 			return contains
 		}
+
 		// If the process is prioritized we should adjust
 		// it's oom_score_adj and avoid lowering its niceness.
 		if slices.ContainsFunc[[]string, string](prioritizedProcs, containsFn) {
-			err = proc.SetOOMAdj(oomScoreAdj)
-			if err != nil {
-				logger.Warn(ctx, "unable to set proc oom_score_adj",
-					slog.F("oom_score_adj", oomScoreAdj),
-					slog.Error(err),
-				)
-				continue
-			}
-			modProcs = append(modProcs, proc)
 			continue
 		}
 

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -2460,20 +2460,7 @@ func TestAgent_ManageProcessPriority(t *testing.T) {
 			o.ProcessManagementTick = ticker
 		})
 		actualProcs := <-modProcs
-		require.Len(t, actualProcs, 4)
-
-		for _, actual := range actualProcs {
-			expectedScore := "0"
-			expected, ok := expectedProcs[actual.PID]
-			require.True(t, ok)
-			if expected.PID == 0 {
-				expectedScore = "-500"
-			}
-
-			score, err := afero.ReadFile(fs, filepath.Join(actual.Dir, "oom_score_adj"))
-			require.NoError(t, err)
-			require.Equal(t, expectedScore, strings.TrimSpace(string(score)))
-		}
+		require.Len(t, actualProcs, len(expectedProcs)-1)
 	})
 
 	t.Run("IgnoreCustomNice", func(t *testing.T) {

diff --git a/agent/agentproc/agentproctest/proc.go b/agent/agentproc/agentproctest/proc.go
@@ -31,7 +31,6 @@ func GenerateProcess(t *testing.T, fs afero.Fs, muts ...func(*agentproc.Process)
 	process := agentproc.Process{
 		CmdLine: cmdline,
 		PID:     int32(pid),
-		FS:      fs,
 	}
 
 	for _, mut := range muts {
@@ -46,8 +45,5 @@ func GenerateProcess(t *testing.T, fs afero.Fs, muts ...func(*agentproc.Process)
 	err = afero.WriteFile(fs, fmt.Sprintf("%s/cmdline", process.Dir), []byte(process.CmdLine), 0o444)
 	require.NoError(t, err)
 
-	err = afero.WriteFile(fs, fmt.Sprintf("%s/oom_score_adj", process.Dir), []byte("0"), 0o444)
-	require.NoError(t, err)
-
 	return process
 }
diff --git a/agent/agentproc/proc_other.go b/agent/agentproc/proc_other.go
@@ -7,10 +7,6 @@ import (
 	"github.com/spf13/afero"
 )
 
-func (p *Process) SetOOMAdj(score int) error {
-	return errUnimplemented
-}
-
 func (p *Process) Niceness(sc Syscaller) (int, error) {
 	return 0, errUnimplemented
 }

diff --git a/agent/agentproc/proc_test.go b/agent/agentproc/proc_test.go
@@ -1,9 +1,7 @@
 package agentproc_test
 
 import (
-	"fmt"
 	"runtime"
-	"strings"
 	"syscall"
 	"testing"
 
@@ -137,23 +135,6 @@ func TestProcess(t *testing.T) {
 		t.Skipf("skipping non-linux environment")
 	}
 
-	t.Run("SetOOMAdj", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			fs            = afero.NewMemMapFs()
-			proc          = agentproctest.GenerateProcess(t, fs)
-			expectedScore = -1000
-		)
-
-		err := proc.SetOOMAdj(expectedScore)
-		require.NoError(t, err)
-
-		actualScore, err := afero.ReadFile(fs, fmt.Sprintf("/proc/%d/oom_score_adj", proc.PID))
-		require.NoError(t, err)
-		require.Equal(t, fmt.Sprintf("%d", expectedScore), strings.TrimSpace(string(actualScore)))
-	})
-
 	t.Run("SetNiceness", func(t *testing.T) {
 		t.Parallel()
 

diff --git a/agent/agentproc/proc_unix.go b/agent/agentproc/proc_unix.go
@@ -54,7 +54,6 @@ func List(fs afero.Fs, syscaller Syscaller) ([]*Process, error) {
 			PID:     int32(pid),
 			CmdLine: string(cmdline),
 			Dir:     filepath.Join(defaultProcDir, entry),
-			FS:      fs,
 		})
 	}
 
@@ -85,20 +84,6 @@ func isProcessExist(syscaller Syscaller, pid int32) (bool, error) {
 	return false, xerrors.Errorf("kill: %w", err)
 }
 
-func (p *Process) SetOOMAdj(score int) error {
-	path := filepath.Join(p.Dir, "oom_score_adj")
-	err := afero.WriteFile(p.FS,
-		path,
-		[]byte(strconv.Itoa(score)),
-		0o644,
-	)
-	if err != nil {
-		return xerrors.Errorf("write %q: %w", path, err)
-	}
-
-	return nil
-}
-
 func (p *Process) Niceness(sc Syscaller) (int, error) {
 	nice, err := sc.GetPriority(p.PID)
 	if err != nil {

diff --git a/agent/agentproc/syscaller.go b/agent/agentproc/syscaller.go
@@ -2,8 +2,6 @@ package agentproc
 
 import (
 	"syscall"
-
-	"github.com/spf13/afero"
 )
 
 type Syscaller interface {
@@ -18,5 +16,4 @@ type Process struct {
 	Dir     string
 	CmdLine string
 	PID     int32
-	FS      afero.Fs
 }
diff --git a/agent/out.txt b/agent/out.txt