admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Using zero serverID for metrics (#31518)

Browse Source 
Fixes: #31516

Signed-off-by: yangxuan <xuan.yang@zilliz.com>
This commit is contained in:
XuanYang-cn 2024-04-01 16:55:19 +08:00 committed by GitHub
parent 4c8cc6ceff
commit 39337e09b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/datanode/data_node.go
View File

@ -227,6 +227,9 @@ func (node *DataNode) initRateCollector() error {
} }
func (node *DataNode) GetNodeID() int64 { func (node *DataNode) GetNodeID() int64 {
if node.serverID == 0 && node.session != nil {
return node.session.ServerID
}
return node.serverID return node.serverID
} }
@ -242,24 +245,25 @@ func (node *DataNode) Init() error {
return return
} }
node.broker = broker.NewCoordBroker(node.rootCoord, node.dataCoord, node.GetNodeID()) serverID := node.session.ServerID
log := log.Ctx(node.ctx).With(zap.String("role", typeutil.DataNodeRole), zap.Int64("nodeID", serverID))
node.broker = broker.NewCoordBroker(node.rootCoord, node.dataCoord, serverID)
err := node.initRateCollector() err := node.initRateCollector()
if err != nil { if err != nil {
log.Error("DataNode server init rateCollector failed", zap.Int64("node ID", node.GetNodeID()), zap.Error(err)) log.Error("DataNode server init rateCollector failed", zap.Error(err))
initError = err initError = err
return return
} }
log.Info("DataNode server init rateCollector done", zap.Int64("node ID", node.GetNodeID())) log.Info("DataNode server init rateCollector done")
node.dispClient = msgdispatcher.NewClient(node.factory, typeutil.DataNodeRole, node.GetNodeID()) node.dispClient = msgdispatcher.NewClient(node.factory, typeutil.DataNodeRole, serverID)
log.Info("DataNode server init dispatcher client done", zap.Int64("node ID", node.GetNodeID())) log.Info("DataNode server init dispatcher client done")
alloc, err := allocator.New(context.Background(), node.rootCoord, node.GetNodeID()) alloc, err := allocator.New(context.Background(), node.rootCoord, serverID)
if err != nil { if err != nil {
log.Error("failed to create id allocator", log.Error("failed to create id allocator", zap.Error(err))
zap.Error(err),
zap.String("role", typeutil.DataNodeRole), zap.Int64("DataNode ID", node.GetNodeID()))
initError = err initError = err
return return
} }
@ -290,7 +294,7 @@ func (node *DataNode) Init() error {
node.channelCheckpointUpdater = newChannelCheckpointUpdater(node) node.channelCheckpointUpdater = newChannelCheckpointUpdater(node)
log.Info("init datanode done", zap.Int64("nodeID", node.GetNodeID()), zap.String("Address", node.address)) log.Info("init datanode done", zap.String("Address", node.address))
}) })
return initError return initError
} }

47
internal/datanode/services.go
View File

@ -72,54 +72,37 @@ func (node *DataNode) GetComponentStates(ctx context.Context, req *milvuspb.GetC
return states, nil return states, nil
} }
// FlushSegments packs flush messages into flowGraph through flushChan.
//
// DataCoord calls FlushSegments if the segment is seal&flush only.
// If DataNode receives a valid segment to flush, new flush message for the segment should be ignored.
// So if receiving calls to flush segment A, DataNode should guarantee the segment to be flushed.
func (node *DataNode) FlushSegments(ctx context.Context, req *datapb.FlushSegmentsRequest) (*commonpb.Status, error) { func (node *DataNode) FlushSegments(ctx context.Context, req *datapb.FlushSegmentsRequest) (*commonpb.Status, error) {
metrics.DataNodeFlushReqCounter.WithLabelValues( serverID := node.GetNodeID()
fmt.Sprint(node.GetNodeID()), metrics.DataNodeFlushReqCounter.WithLabelValues(fmt.Sprint(serverID), metrics.TotalLabel).Inc()
metrics.TotalLabel).Inc()
log := log.Ctx(ctx) log := log.Ctx(ctx).With(
zap.Int64("nodeID", serverID),
zap.Int64("collectionID", req.GetCollectionID()),
zap.String("channelName", req.GetChannelName()),
zap.Int64s("segmentIDs", req.GetSegmentIDs()),
)
log.Info("receive FlushSegments request")
if err := merr.CheckHealthy(node.GetStateCode()); err != nil { if err := merr.CheckHealthy(node.GetStateCode()); err != nil {
log.Warn("DataNode.FlushSegments failed", zap.Int64("nodeId", node.GetNodeID()), zap.Error(err)) log.Warn("failed to FlushSegments", zap.Error(err))
return merr.Status(err), nil return merr.Status(err), nil
} }
serverID := node.GetSession().ServerID
if req.GetBase().GetTargetID() != serverID { if req.GetBase().GetTargetID() != serverID {
log.Warn("flush segment target id not matched", log.Warn("faled to FlushSegments, target node not match", zap.Int64("targetID", req.GetBase().GetTargetID()))
zap.Int64("targetID", req.GetBase().GetTargetID()),
zap.Int64("serverID", serverID),
)
return merr.Status(merr.WrapErrNodeNotMatch(req.GetBase().GetTargetID(), serverID)), nil return merr.Status(merr.WrapErrNodeNotMatch(req.GetBase().GetTargetID(), serverID)), nil
} }
segmentIDs := req.GetSegmentIDs() err := node.writeBufferManager.SealSegments(ctx, req.GetChannelName(), req.GetSegmentIDs())
log = log.With(
zap.Int64("collectionID", req.GetCollectionID()),
zap.String("channelName", req.GetChannelName()),
zap.Int64s("segmentIDs", segmentIDs),
)
log.Info("receiving FlushSegments request")
err := node.writeBufferManager.SealSegments(ctx, req.GetChannelName(), segmentIDs)
if err != nil { if err != nil {
log.Warn("failed to flush segments", zap.Error(err)) log.Warn("failed to FlushSegments", zap.Error(err))
return merr.Status(err), nil return merr.Status(err), nil
} }
// Log success flushed segments. log.Info("success to FlushSegments")
log.Info("sending segments to WriteBuffer Manager")
metrics.DataNodeFlushReqCounter.WithLabelValues( metrics.DataNodeFlushReqCounter.WithLabelValues(fmt.Sprint(serverID), metrics.SuccessLabel).Inc()
fmt.Sprint(node.GetNodeID()),
metrics.SuccessLabel).Inc()
return merr.Success(), nil return merr.Success(), nil
} }

1
pkg/mq/msgdispatcher/client.go
View File

@ -56,7 +56,6 @@ func NewClient(factory msgstream.Factory, role string, nodeID int64) Client {
role: role, role: role,
nodeID: nodeID, nodeID: nodeID,
factory: factory, factory: factory,
// managers: typeutil.NewConcurrentMap[string, DispatcherManager](),
managers: make(map[string]DispatcherManager), managers: make(map[string]DispatcherManager),
} }
} }