fix(gc): sync repodb when gc'ing manifests (#1819)

fix(gc): fix cleaning deduped blobs because they have the modTime of
the original blobs, fixed by updating the modTime when hard linking
the blobs.
fix(gc): failing to parse rootDir at zot startup when using s3 storage
because there are no files under rootDir and we can not create empty dirs
on s3, fixed by creating an empty file under rootDir.

Signed-off-by: Petu Eusebiu <peusebiu@cisco.com>

pkg/test/common.go

@@ -1574,7 +1574,7 @@ func CustomRedirectPolicy(noOfRedirect int) resty.RedirectPolicy {
 }
 
 func GetDefaultImageStore(rootDir string, log zLog.Logger) stypes.ImageStore {
-	return local.NewImageStore(rootDir, false, false, time.Hour, time.Hour, false, false, log,
+	return local.NewImageStore(rootDir, false, false, log,
 		monitoring.NewMetricsServer(false, log),
 		mocks.MockedLint{
 			LintFn: func(repo string, manifestDigest godigest.Digest, imageStore stypes.ImageStore) (bool, error) {

pkg/test/mocks/image_store_mock.go

@@ -52,6 +52,8 @@ type MockedImageStore struct {
 	RunDedupeForDigestFn         func(digest godigest.Digest, dedupe bool, duplicateBlobs []string) error
 	GetNextDigestWithBlobPathsFn func(lastDigests []godigest.Digest) (godigest.Digest, []string, error)
 	GetAllBlobsFn                func(repo string) ([]string, error)
+	CleanupRepoFn                func(repo string, blobs []godigest.Digest, removeRepo bool) (int, error)
+	PutIndexContentFn            func(repo string, index ispec.Index) error
 }
 
 func (is MockedImageStore) Lock(t *time.Time) {
@@ -378,3 +380,19 @@ func (is MockedImageStore) GetNextDigestWithBlobPaths(lastDigests []godigest.Dig
 
 	return "", []string{}, nil
 }
+
+func (is MockedImageStore) CleanupRepo(repo string, blobs []godigest.Digest, removeRepo bool) (int, error) {
+	if is.CleanupRepoFn != nil {
+		return is.CleanupRepoFn(repo, blobs, removeRepo)
+	}
+
+	return 0, nil
+}
+
+func (is MockedImageStore) PutIndexContent(repo string, index ispec.Index) error {
+	if is.PutIndexContentFn != nil {
+		return is.PutIndexContentFn(repo, index)
+	}
+
+	return nil
+}

pkg/test/mocks/repo_db_mock.go

@@ -21,6 +21,8 @@ type MetaDBMock struct {
 
 	SetRepoReferenceFn func(repo string, Reference string, manifestDigest godigest.Digest, mediaType string) error
 
+	RemoveRepoReferenceFn func(repo, reference string, manifestDigest godigest.Digest) error
+
 	DeleteRepoTagFn func(repo string, tag string) error
 
 	GetRepoMetaFn func(repo string) (mTypes.RepoMetadata, error)
@@ -168,6 +170,14 @@ func (sdm MetaDBMock) SetRepoReference(repo string, reference string, manifestDi
 	return nil
 }
 
+func (sdm MetaDBMock) RemoveRepoReference(repo, reference string, manifestDigest godigest.Digest) error {
+	if sdm.RemoveRepoReferenceFn != nil {
+		return sdm.RemoveRepoReferenceFn(repo, reference, manifestDigest)
+	}
+
+	return nil
+}
+
 func (sdm MetaDBMock) DeleteRepoTag(repo string, tag string) error {
 	if sdm.DeleteRepoTagFn != nil {
 		return sdm.DeleteRepoTagFn(repo, tag)

pkg/test/oci-layout/oci_layout_test.go

@@ -347,7 +347,7 @@ func TestExtractImageDetails(t *testing.T) {
 	Convey("extractImageDetails good workflow", t, func() {
 		dir := t.TempDir()
 		testLogger := log.NewLogger("debug", "")
-		imageStore := local.NewImageStore(dir, false, false, 0, 0, false, false,
+		imageStore := local.NewImageStore(dir, false, false,
 			testLogger, monitoring.NewMetricsServer(false, testLogger), nil, nil)
 
 		storeController := storage.StoreController{
@@ -383,7 +383,7 @@ func TestExtractImageDetails(t *testing.T) {
 	Convey("extractImageDetails bad ispec.ImageManifest", t, func() {
 		dir := t.TempDir()
 		testLogger := log.NewLogger("debug", "")
-		imageStore := local.NewImageStore(dir, false, false, 0, 0, false, false,
+		imageStore := local.NewImageStore(dir, false, false,
 			testLogger, monitoring.NewMetricsServer(false, testLogger), nil, nil)
 
 		storeController := storage.StoreController{
@@ -403,7 +403,7 @@ func TestExtractImageDetails(t *testing.T) {
 	Convey("extractImageDetails bad imageConfig", t, func() {
 		dir := t.TempDir()
 		testLogger := log.NewLogger("debug", "")
-		imageStore := local.NewImageStore(dir, false, false, 0, 0, false, false,
+		imageStore := local.NewImageStore(dir, false, false,
 			testLogger, monitoring.NewMetricsServer(false, testLogger), nil, nil)
 
 		storeController := storage.StoreController{