fix(metadb): populate image pushTimestamp if it's 0 value

in the case of an already existing meta db without pushTimestamp field its value would be 0 until image is updated, check for zero values and update them with time.Now() so that retention logic won't remove them. Signed-off-by: Petu Eusebiu <[email protected]>
project-zot · Nov 8, 2023 · 56434c7 · 56434c7
1 parent 7f52f58
commit 56434c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/pkg/meta/boltdb/boltdb.go b/pkg/meta/boltdb/boltdb.go
@@ -200,6 +200,8 @@ func (bdw *BoltDB) SetRepoReference(ctx context.Context, repo string, reference
 				PushTimestamp:     timestamppb.Now(),
 				PushedBy:          userid,
 			}
+		} else if protoRepoMeta.Statistics[imageMeta.Digest.String()].PushTimestamp.AsTime().IsZero() {
+			protoRepoMeta.Statistics[imageMeta.Digest.String()].PushTimestamp = timestamppb.Now()
 		}
 
 		if _, ok := protoRepoMeta.Signatures[imageMeta.Digest.String()]; !ok {

diff --git a/pkg/meta/dynamodb/dynamodb.go b/pkg/meta/dynamodb/dynamodb.go
@@ -323,6 +323,8 @@ func (dwr *DynamoDB) SetRepoReference(ctx context.Context, repo string, referenc
 			PushTimestamp:     timestamppb.Now(),
 			PushedBy:          userid,
 		}
+	} else if repoMeta.Statistics[imageMeta.Digest.String()].PushTimestamp.AsTime().IsZero() {
+		repoMeta.Statistics[imageMeta.Digest.String()].PushTimestamp = timestamppb.Now()
 	}
 
 	if _, ok := repoMeta.Signatures[imageMeta.Digest.String()]; !ok {

diff --git a/pkg/meta/parse_test.go b/pkg/meta/parse_test.go
@@ -352,6 +352,14 @@ func RunParseStorageTests(rootDir string, metaDB mTypes.MetaDB) {
 		So(repoMeta.StarCount, ShouldEqual, 1)
 		So(time.Now(), ShouldHappenAfter, repoMeta.Statistics[image.DigestStr()].LastPullTimestamp)
 
+		// update statistics (simulate that a metaDB has most statistics, but not pushTimestamp)
+		stats := repoMeta.Statistics[image.DigestStr()]
+		stats.PushTimestamp = time.Time{}
+		repoMeta.Statistics[image.DigestStr()] = stats
+
+		err = metaDB.SetRepoMeta(repo, repoMeta)
+		So(err, ShouldBeNil)
+
 		err = meta.ParseStorage(metaDB, storeController, log.NewLogger("debug", ""))
 		So(err, ShouldBeNil)