From 195f50bac567a028e980074b9b3b36aa8484ee33 Mon Sep 17 00:00:00 2001
From: Andrei Aaron <andreifdaaron@gmail.com>
Date: Fri, 31 Oct 2025 22:13:44 +0200
Subject: [PATCH] fix: close file handle before moving file in FullBlobUpload
 (#3499)

Should fix a Windows specific issue where renaming a file fails if the handler is not closed.

Signed-off-by: Andrei Aaron <andreifdaaron@gmail.com>
---
 pkg/storage/imagestore/imagestore.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkg/storage/imagestore/imagestore.go b/pkg/storage/imagestore/imagestore.go
index 6111cf6b..622626e5 100644
--- a/pkg/storage/imagestore/imagestore.go
+++ b/pkg/storage/imagestore/imagestore.go
@@ -1082,21 +1082,35 @@ func (is *ImageStore) FullBlobUpload(repo string, body io.Reader, dstDigest godi
 		return "", -1, zerr.ErrUploadNotFound
 	}
 
-	defer blobFile.Close()
-
 	mw := io.MultiWriter(blobFile, digester)
 
 	nbytes, err := io.Copy(mw, body)
 	if err != nil {
+		_ = blobFile.Close()
+
+		is.log.Error().Err(err).Str("blob", src).Msg("failed to write blob")
+
 		return "", -1, err
 	}
 
 	if err := blobFile.Commit(context.Background()); err != nil {
+		_ = blobFile.Close()
+
 		is.log.Error().Err(err).Str("blob", src).Msg("failed to commit blob")
 
 		return "", -1, err
 	}
 
+	// Close explicitly before returning so the subsequent move/rename can succeed on Windows.
+	// - Windows does not allow renaming/moving a file while there is any open handle to it.
+	// - If we relied on a deferred close, the handle would be released only when the function returns,
+	// which would prevent the move/rename operation from succeeding on Windows.
+	if err := blobFile.Close(); err != nil {
+		is.log.Error().Err(err).Msg("failed to close blob")
+
+		return "", -1, err
+	}
+
 	srcDigest := godigest.NewDigestFromEncoded(dstDigestAlgorithm, hex.EncodeToString(digester.Sum(nil)))
 	if srcDigest != dstDigest {
 		is.log.Error().Str("srcDigest", srcDigest.String()).