fix

Signed-off-by: Cai Zhang <[email protected]>
milvus-io · Dec 4, 2024 · d5ec0c5 · d5ec0c5
1 parent 8914cf9
commit d5ec0c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go
@@ -143,7 +143,7 @@ func (node *Proxy) InvalidateCollectionMetaCache(ctx context.Context, request *p
 		case commonpb.MsgType_LoadCollection, commonpb.MsgType_ReleaseCollection:
 			// All the request from query use collectionID
 			if request.CollectionID != UniqueID(0) {
-				aliasName = globalMetaCache.RemoveCollectionsByID(ctx, collectionID, request.GetBase().GetTimestamp(), false)
+				aliasName = globalMetaCache.RemoveCollectionsByID(ctx, collectionID, 0, false)
 				for _, name := range aliasName {
 					globalMetaCache.DeprecateShardCache(request.GetDbName(), name)
 				}

diff --git a/internal/proxy/meta_cache.go b/internal/proxy/meta_cache.go
@@ -490,7 +490,8 @@ func (m *MetaCache) update(ctx context.Context, database, collectionName string,
 
 	log.Ctx(ctx).Info("meta update success", zap.String("database", database), zap.String("collectionName", collectionName),
 		zap.String("actual collection Name", collection.Schema.GetName()), zap.Int64("collectionID", collection.CollectionID),
-		zap.Strings("partition", partitions.PartitionNames),
+		zap.Strings("partition", partitions.PartitionNames), zap.Uint64("currentVersion", curVersion),
+		zap.Uint64("version", collection.GetRequestTime()),
 	)
 
 	m.collectionCacheVersion[collection.GetCollectionID()] = collection.GetRequestTime()
@@ -849,11 +850,13 @@ func (m *MetaCache) RemoveCollection(ctx context.Context, database, collectionNa
 func (m *MetaCache) RemoveCollectionsByID(ctx context.Context, collectionID UniqueID, version uint64, removeVersion bool) []string {
 	m.mu.Lock()
 	defer m.mu.Unlock()
+
+	curVersion := m.collectionCacheVersion[collectionID]
 	var collNames []string
 	for database, db := range m.collInfo {
 		for k, v := range db {
 			if v.collID == collectionID {
-				if m.collectionCacheVersion[collectionID] <= version {
+				if version == 0 || curVersion <= version {
 					delete(m.collInfo[database], k)
 					collNames = append(collNames, k)
 				}
@@ -862,10 +865,12 @@ func (m *MetaCache) RemoveCollectionsByID(ctx context.Context, collectionID Uniq
 	}
 	if removeVersion {
 		delete(m.collectionCacheVersion, collectionID)
-	} else {
+	} else if version != 0 {
 		m.collectionCacheVersion[collectionID] = version
 	}
-	log.Debug("remove collection by id", zap.Int64("id", collectionID), zap.Strings("collection", collNames))
+	log.Debug("remove collection by id", zap.Int64("id", collectionID),
+		zap.Strings("collection", collNames), zap.Uint64("currentVersion", curVersion),
+		zap.Uint64("version", version), zap.Bool("removeVersion", removeVersion))
 	return collNames
 }