Fix windows race condition when writing image with duplicate layers (#…

…1921) * Add mutex around os.Rename when on windows Signed-off-by: David Gannon <[email protected]> * Update pkg/v1/layout/write.go --------- Signed-off-by: David Gannon <[email protected]> Co-authored-by: Jason Hall <[email protected]>
google · May 30, 2024 · 3764db2 · 3764db2
1 parent 39d1148
commit 3764db2
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/pkg/v1/layout/write.go b/pkg/v1/layout/write.go
@@ -22,6 +22,8 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"runtime"
+	"sync"
 
 	"github.com/google/go-containerregistry/pkg/logs"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -37,6 +39,9 @@ var layoutFile = `{
     "imageLayoutVersion": "1.0.0"
 }`
 
+// renameMutex guards os.Rename calls in AppendImage on Windows only.
+var renameMutex sync.Mutex
+
 // AppendImage writes a v1.Image to the Path and updates
 // the index.json to reference it.
 func (l Path) AppendImage(img v1.Image, options ...Option) error {
@@ -259,6 +264,11 @@ func (l Path) writeBlob(hash v1.Hash, size int64, rc io.ReadCloser, renamer func
 	}
 
 	renamePath := l.path("blobs", finalHash.Algorithm, finalHash.Hex)
+
+	if runtime.GOOS == "windows" {
+		renameMutex.Lock()
+		defer renameMutex.Unlock()
+	}
 	return os.Rename(w.Name(), renamePath)
 }