Merge pull request #670 from openshift-bot/synchronize-upstream

OCPBUGS-78787: Synchronize from upstream

Author: openshift-merge-bot[bot]

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: dd1c319eded29d55bad6eb39a741f88ca53329df
+expectedMergeBase: a307a6daf5c5b1bd78c75e0ed02aeaf5c7f9d94d
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

internal/operator-controller/catalogmetadata/cache/cache.go

@@ -6,6 +6,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
@@ -75,10 +76,15 @@ func (fsc *filesystemCache) Put(catalogName, resolvedRef string, source io.Reade
 func (fsc *filesystemCache) writeFS(catalogName string, source io.Reader) (fs.FS, error) {
 	cacheDir := fsc.cacheDir(catalogName)
 
+	if err := fsc.removeOrphanedTempDirs(catalogName); err != nil {
+		return nil, err
+	}
+
 	tmpDir, err := os.MkdirTemp(fsc.cachePath, fmt.Sprintf(".%s-", catalogName))
 	if err != nil {
 		return nil, fmt.Errorf("error creating temporary directory to unpack catalog metadata: %v", err)
 	}
+	defer os.RemoveAll(tmpDir)
 
 	if err := declcfg.WalkMetasReader(source, func(meta *declcfg.Meta, err error) error {
 		if err != nil {
@@ -164,3 +170,26 @@ func (fsc *filesystemCache) Remove(catalogName string) error {
 func (fsc *filesystemCache) cacheDir(catalogName string) string {
 	return filepath.Join(fsc.cachePath, catalogName)
 }
+
+// removeOrphanedTempDirs removes temporary staging directories left behind by a
+// previous writeFS call for the given catalog that was interrupted before the
+// rename (e.g. pod eviction or crash). Temp dirs use the prefix ".{catalogName}-"
+// as created by os.MkdirTemp. This method must be called while the write lock is held.
+func (fsc *filesystemCache) removeOrphanedTempDirs(catalogName string) error {
+	entries, err := os.ReadDir(fsc.cachePath)
+	if os.IsNotExist(err) {
+		return nil
+	}
+	if err != nil {
+		return fmt.Errorf("error reading cache directory: %w", err)
+	}
+	prefix := fmt.Sprintf(".%s-", catalogName)
+	for _, entry := range entries {
+		if strings.HasPrefix(entry.Name(), prefix) {
+			if err := os.RemoveAll(filepath.Join(fsc.cachePath, entry.Name())); err != nil {
+				return fmt.Errorf("error removing orphaned temp directory %q: %w", entry.Name(), err)
+			}
+		}
+	}
+	return nil
+}

internal/operator-controller/catalogmetadata/cache/cache_test.go

@@ -169,6 +169,30 @@ func TestFilesystemCacheRemove(t *testing.T) {
 	assert.NoDirExists(t, catalogCachePath)
 }
 
+func TestFilesystemCachePutCleansOrphanedTempDirs(t *testing.T) {
+	const catalogName = "test-catalog"
+	cacheDir := t.TempDir()
+	c := cache.NewFilesystemCache(cacheDir)
+
+	// Simulate temp dirs left behind by a previous interrupted Put for this catalog.
+	orphan1 := filepath.Join(cacheDir, ".test-catalog-1234567890")
+	orphan2 := filepath.Join(cacheDir, ".test-catalog-9876543210")
+	require.NoError(t, os.MkdirAll(orphan1, 0700))
+	require.NoError(t, os.MkdirAll(orphan2, 0700))
+
+	// A temp dir for a different catalog should NOT be removed.
+	otherOrphan := filepath.Join(cacheDir, ".other-catalog-1111111111")
+	require.NoError(t, os.MkdirAll(otherOrphan, 0700))
+
+	_, err := c.Put(catalogName, "fake/catalog@sha256:fakesha", defaultContent(), nil)
+	require.NoError(t, err)
+
+	assert.NoDirExists(t, orphan1, "orphaned temp dir for catalog should have been removed")
+	assert.NoDirExists(t, orphan2, "orphaned temp dir for catalog should have been removed")
+	assert.DirExists(t, otherOrphan, "temp dir for a different catalog should not be removed")
+	assert.DirExists(t, filepath.Join(cacheDir, catalogName), "real cache dir should exist")
+}
+
 func equalFilesystems(expected, actual fs.FS) error {
 	normalizeJSON := func(data []byte) []byte {
 		var v interface{}

requirements.txt

@@ -1,7 +1,7 @@
 Babel==2.18.0
 beautifulsoup4==4.14.3
 certifi==2026.2.25
-charset-normalizer==3.4.4
+charset-normalizer==3.4.5
 click==8.3.1
 colorama==0.4.6
 cssselect==1.4.0
@@ -19,7 +19,7 @@ mkdocs-material-extensions==1.3.1
 packaging==26.0
 paginate==0.5.7
 pathspec==1.0.4
-platformdirs==4.9.2
+platformdirs==4.9.4
 Pygments==2.19.2
 pymdown-extensions==10.21
 pyquery==2.0.1