Merge pull request #95 from wayblink/update-ts

Add physical timestamp

Author: lentitude2tk

core/backup_context.go

@@ -471,6 +471,7 @@ func (b BackupContext) executeCreateBackup(ctx context.Context, request *backupp
 			zap.Int64s("flushedSegmentIDs", flushedSegmentIDs),
 			zap.Int64("timeOfSeal", timeOfSeal))
 		collection.BackupTimestamp = utils.ComposeTS(timeOfSeal, 0)
+		collection.BackupPhysicalTimestamp = uint64(timeOfSeal)
 
 		flushSegments := append(newSealedSegmentIDs, flushedSegmentIDs...)
 		segmentEntities, err := b.milvusClient.GetPersistentSegmentInfo(ctx, collection.GetCollectionName())

core/backup_meta.go

@@ -49,17 +49,18 @@ func treeToLevel(backup *backuppb.BackupInfo) (LeveledBackupInfo, error) {
 
 	for _, collectionBack := range backup.GetCollectionBackups() {
 		cloneCollectionBackup := &backuppb.CollectionBackupInfo{
-			CollectionId:     collectionBack.GetCollectionId(),
-			DbName:           collectionBack.GetDbName(),
-			CollectionName:   collectionBack.GetCollectionName(),
-			Schema:           collectionBack.GetSchema(),
-			ShardsNum:        collectionBack.GetShardsNum(),
-			ConsistencyLevel: collectionBack.GetConsistencyLevel(),
-			BackupTimestamp:  collectionBack.GetBackupTimestamp(),
-			Size:             collectionBack.GetSize(),
-			HasIndex:         collectionBack.GetHasIndex(),
-			IndexInfos:       collectionBack.GetIndexInfos(),
-			LoadState:        collectionBack.GetLoadState(),
+			CollectionId:            collectionBack.GetCollectionId(),
+			DbName:                  collectionBack.GetDbName(),
+			CollectionName:          collectionBack.GetCollectionName(),
+			Schema:                  collectionBack.GetSchema(),
+			ShardsNum:               collectionBack.GetShardsNum(),
+			ConsistencyLevel:        collectionBack.GetConsistencyLevel(),
+			BackupTimestamp:         collectionBack.GetBackupTimestamp(),
+			Size:                    collectionBack.GetSize(),
+			HasIndex:                collectionBack.GetHasIndex(),
+			IndexInfos:              collectionBack.GetIndexInfos(),
+			LoadState:               collectionBack.GetLoadState(),
+			BackupPhysicalTimestamp: collectionBack.GetBackupPhysicalTimestamp(),
 		}
 		collections = append(collections, cloneCollectionBackup)
 
@@ -257,16 +258,17 @@ func SimpleBackupResponse(input *backuppb.BackupInfoResponse) *backuppb.BackupIn
 	collections := make([]*backuppb.CollectionBackupInfo, 0)
 	for _, coll := range backup.GetCollectionBackups() {
 		collections = append(collections, &backuppb.CollectionBackupInfo{
-			StateCode:       coll.GetStateCode(),
-			ErrorMessage:    coll.GetErrorMessage(),
-			CollectionName:  coll.GetCollectionName(),
-			BackupTimestamp: coll.GetBackupTimestamp(),
-			HasIndex:        coll.GetHasIndex(),
-			IndexInfos:      coll.GetIndexInfos(),
-			LoadState:       coll.GetLoadState(),
-			Schema:          coll.GetSchema(),
-			Size:            coll.GetSize(),
-			Progress:        coll.GetProgress(),
+			StateCode:               coll.GetStateCode(),
+			ErrorMessage:            coll.GetErrorMessage(),
+			CollectionName:          coll.GetCollectionName(),
+			BackupTimestamp:         coll.GetBackupTimestamp(),
+			HasIndex:                coll.GetHasIndex(),
+			IndexInfos:              coll.GetIndexInfos(),
+			LoadState:               coll.GetLoadState(),
+			Schema:                  coll.GetSchema(),
+			Size:                    coll.GetSize(),
+			Progress:                coll.GetProgress(),
+			BackupPhysicalTimestamp: coll.GetBackupPhysicalTimestamp(),
 		})
 	}
 	simpleBackupInfo := &backuppb.BackupInfo{

core/proto/backup.proto

@@ -51,11 +51,14 @@ message CollectionBackupInfo {
   int32 shards_num = 11;
   ConsistencyLevel consistency_level = 12;
   repeated PartitionBackupInfo partition_backups = 13;
+  // logical time of backup, used for restore
   uint64 backup_timestamp = 14;
   int64 size = 15;
   bool has_index = 16;
   repeated IndexInfo index_infos = 17;
   string load_state = 18;
+  // physical unix time of backup 
+  uint64 backup_physical_timestamp = 19;
 }
 
 message PartitionBackupInfo {