enhance: [10kcp] Reducing the granularity of locks in the target mana…

…ger (#38956) pr: #38566 Just for test, I'll remove the global mutex latter. Signed-off-by: bigsheeper <[email protected]>
milvus-io · Jan 2, 2025 · 663ec6f · 663ec6f
1 parent 7934c21
commit 663ec6f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/internal/querycoordv2/meta/target_manager.go b/internal/querycoordv2/meta/target_manager.go
@@ -152,8 +152,6 @@ func (mgr *TargetManager) UpdateCollectionNextTarget(collectionID int64) error {
 		return err
 	}
 
-	mgr.rwMutex.Lock()
-	defer mgr.rwMutex.Unlock()
 	partitions := mgr.meta.GetPartitionsByCollection(collectionID)
 	partitionIDs := lo.Map(partitions, func(partition *Partition, i int) int64 {
 		return partition.PartitionID
@@ -183,7 +181,7 @@ func (mgr *TargetManager) UpdateCollectionNextTarget(collectionID int64) error {
 	}
 
 	for _, infos := range channelInfos {
-		merged := mgr.mergeDmChannelInfo(infos)
+		merged := mergeDmChannelInfo(infos)
 		dmChannels[merged.GetChannelName()] = merged
 	}
 
@@ -193,15 +191,19 @@ func (mgr *TargetManager) UpdateCollectionNextTarget(collectionID int64) error {
 	}
 
 	allocatedTarget := NewCollectionTarget(segments, dmChannels, partitionIDs)
+
+	mgr.rwMutex.Lock()
 	mgr.next.updateCollectionTarget(collectionID, allocatedTarget)
+	mgr.rwMutex.Unlock()
+
 	log.Debug("finish to update next targets for collection",
 		zap.Int64("collectionID", collectionID),
 		zap.Int64s("PartitionIDs", partitionIDs))
 
 	return nil
 }
 
-func (mgr *TargetManager) mergeDmChannelInfo(infos []*datapb.VchannelInfo) *DmChannel {
+func mergeDmChannelInfo(infos []*datapb.VchannelInfo) *DmChannel {
 	var dmChannel *DmChannel
 
 	for _, info := range infos {