Fix load segment request too large

Signed-off-by: xige-16 <xi.ge@zilliz.com>
milvus-io · Oct 28, 2021 · 6b0e202 · 6b0e202
1 parent b5fc643
commit 6b0e202
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/internal/querycoord/task.go b/internal/querycoord/task.go
@@ -1934,7 +1934,7 @@ func assignInternalTask(ctx context.Context,
 			node2Segments[nodeID] = append(node2Segments[nodeID], loadSegmentRequests[index])
 			sizeCounts[nodeID] = sizeOfReq
 		} else {
-			if sizeCounts[nodeID]+sizeOfReq > 2097152 {
+			if sizeCounts[nodeID]+sizeOfReq > MaxSendSizeToEtcd {
 				node2Segments[nodeID] = append(node2Segments[nodeID], loadSegmentRequests[index])
 				sizeCounts[nodeID] = sizeOfReq
 			} else {

diff --git a/internal/querycoord/task_scheduler.go b/internal/querycoord/task_scheduler.go
@@ -457,6 +457,18 @@ func (scheduler *TaskScheduler) processTask(t task) error {
 			}
 			childTask.setTaskID(id)
 			childTaskKey := fmt.Sprintf("%s/%d", activeTaskPrefix, childTask.getTaskID())
+			var protoSize int
+			switch childTask.msgType() {
+			case commonpb.MsgType_LoadSegments:
+				protoSize = proto.Size(childTask.(*loadSegmentTask).LoadSegmentsRequest)
+			case commonpb.MsgType_WatchDmChannels:
+				protoSize = proto.Size(childTask.(*watchDmChannelTask).WatchDmChannelsRequest)
+			case commonpb.MsgType_WatchQueryChannels:
+				protoSize = proto.Size(childTask.(*watchQueryChannelTask).AddQueryChannelRequest)
+			default:
+				//TODO::
+			}
+			log.Debug("updateKVFn: the size of internal request", zap.Int("size", protoSize), zap.Int64("taskID", childTask.getTaskID()))
 			blobs, err := childTask.marshal()
 			if err != nil {
 				return err