fix: dedupe

rchincha · rchincha · commit 6edb9fb90a24 · 2025-09-03T20:05:47.000-07:00
Signed-off-by: Ramkumar Chinchani &lt;rchincha.dev@gmail.com&gt;
diff --git a/pkg/storage/imagestore/imagestore.go b/pkg/storage/imagestore/imagestore.go
@@ -1182,12 +1182,16 @@ retry:
 		blobUploadRemoved = true
 
 		dstRecord = path.Join(constants.GlobalBlobsRepo, ispec.ImageBlobsDir, dstDigest.Algorithm().String(), dstDigest.Encoded())
+		if !is.cache.UsesRelativePaths() {
+			dstRecord = path.Join(is.rootDir, dstRecord)
+		}
 
 		is.log.Debug().Str("src", src).Str("dst", dst).Str("dstRecord", dstRecord).Str("component", "dedupe").Msg("rename")
 	}
 
 	// cache record exists, but due to GC and upgrades from older versions,
 	// disk content and cache records may go out of sync
+	is.log.Debug().Bool("relpath?", is.cache.UsesRelativePaths()).Msg("check this")
 	if is.cache.UsesRelativePaths() {
 		dstRecord = path.Join(is.rootDir, dstRecord)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1182,12 +1182,16 @@ retry:`
`1182`	`1182`	`blobUploadRemoved = true`
`1183`	`1183`
`1184`	`1184`	`dstRecord = path.Join(constants.GlobalBlobsRepo, ispec.ImageBlobsDir, dstDigest.Algorithm().String(), dstDigest.Encoded())`
	`1185`	`+ if !is.cache.UsesRelativePaths() {`
	`1186`	`+ dstRecord = path.Join(is.rootDir, dstRecord)`
	`1187`	`+ }`
`1185`	`1188`
`1186`	`1189`	`is.log.Debug().Str("src", src).Str("dst", dst).Str("dstRecord", dstRecord).Str("component", "dedupe").Msg("rename")`
`1187`	`1190`	`}`
`1188`	`1191`
`1189`	`1192`	`// cache record exists, but due to GC and upgrades from older versions,`
`1190`	`1193`	`// disk content and cache records may go out of sync`
	`1194`	`+ is.log.Debug().Bool("relpath?", is.cache.UsesRelativePaths()).Msg("check this")`
`1191`	`1195`	`if is.cache.UsesRelativePaths() {`
`1192`	`1196`	`dstRecord = path.Join(is.rootDir, dstRecord)`
`1193`	`1197`	`}`