Merge branch 'fix/cgroup-dir-deletion' into 'master'

Stop error level logging on deleting cgroup file

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5216

Merged-by: Sami Hiltunen <shiltunen@gitlab.com>
Approved-by: Sami Hiltunen <shiltunen@gitlab.com>
Co-authored-by: Steve Azzopardi <sazzopardi@gitlab.com>

3 files changed, 12 insertions, 4 deletions

diff --git a/internal/cgroups/cgroups_linux_test.go b/internal/cgroups/cgroups_linux_test.go
index 5f621a6e1..cf1861397 100644
--- a/internal/cgroups/cgroups_linux_test.go
+++ b/internal/cgroups/cgroups_linux_test.go
@@ -4,6 +4,7 @@ package cgroups
 
 import (
 	"fmt"
+	"io/fs"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -95,6 +96,14 @@ func TestPruneOldCgroups(t *testing.T) {
 				cgroupManager := NewManager(cfg, pid)
 				require.NoError(t, cgroupManager.Setup())
 
+				memoryRoot := filepath.Join(
+					cfg.Mountpoint,
+					"memory",
+					cfg.HierarchyRoot,
+					"memory.limit_in_bytes",
+				)
+				require.NoError(t, os.WriteFile(memoryRoot, []byte{}, fs.ModeAppend))
+
 				return pid
 			},
 			expectedPruned: true,
diff --git a/internal/gitaly/config/temp_dir.go b/internal/gitaly/config/temp_dir.go
index 01f6a55dc..8aaa3ad4c 100644
--- a/internal/gitaly/config/temp_dir.go
+++ b/internal/gitaly/config/temp_dir.go
@@ -26,8 +26,8 @@ func PruneOldGitalyProcessDirectories(log log.FieldLogger, directory string) err
 		log := log.WithField("path", filepath.Join(directory, entry.Name()))
 		if err := func() error {
 			if !entry.IsDir() {
-				// There should be no files, only the gitaly process directories.
-				return errors.New("gitaly process directory contains an unexpected file")
+				log.Info("ignoring file found in gitaly process directory")
+				return nil
 			}
 
 			components := strings.Split(entry.Name(), "-")
diff --git a/internal/gitaly/config/temp_dir_test.go b/internal/gitaly/config/temp_dir_test.go
index e30d0890c..25c99bab0 100644
--- a/internal/gitaly/config/temp_dir_test.go
+++ b/internal/gitaly/config/temp_dir_test.go
@@ -64,8 +64,7 @@ func TestPruneOldGitalyProcessDirectories(t *testing.T) {
 		// Create an unexpected file in the runtime directory
 		unexpectedFilePath := filepath.Join(baseDir, "unexpected-file")
 		require.NoError(t, os.WriteFile(unexpectedFilePath, []byte(""), os.ModePerm))
-		expectedLogs[unexpectedFilePath] = "could not prune entry"
-		expectedErrs[unexpectedFilePath] = errors.New("gitaly process directory contains an unexpected file")
+		expectedLogs[unexpectedFilePath] = "ignoring file found in gitaly process directory"
 
 		nonPrunableDirs := []string{ownRuntimeDir}