From a7ba416b5a6786d10c7a76e8878282174164a5d2 Mon Sep 17 00:00:00 2001 From: smellthemoon <64083300+smellthemoon@users.noreply.github.com> Date: Mon, 14 Nov 2022 16:21:07 +0800 Subject: [PATCH] Remove invalid timestamp (#20557) Signed-off-by: lixinguo Signed-off-by: lixinguo Co-authored-by: lixinguo --- internal/allocator/id_allocator.go | 1 - internal/datacoord/allocator.go | 2 -- internal/datacoord/server.go | 1 - internal/datanode/allocator.go | 3 +-- internal/datanode/data_node.go | 2 -- internal/datanode/data_sync_service.go | 1 - internal/datanode/flush_manager.go | 6 ++---- internal/datanode/meta_service.go | 3 +-- internal/proxy/impl.go | 6 ------ internal/proxy/proxy.go | 1 - internal/proxy/timestamp.go | 1 - 11 files changed, 4 insertions(+), 23 deletions(-) diff --git a/internal/allocator/id_allocator.go b/internal/allocator/id_allocator.go index afeffa7076..941d07ebf6 100644 --- a/internal/allocator/id_allocator.go +++ b/internal/allocator/id_allocator.go @@ -97,7 +97,6 @@ func (ia *IDAllocator) syncID() (bool, error) { Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestID), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(ia.PeerID), ), Count: need, diff --git a/internal/datacoord/allocator.go b/internal/datacoord/allocator.go index fced183149..4f9d50eab1 100644 --- a/internal/datacoord/allocator.go +++ b/internal/datacoord/allocator.go @@ -54,7 +54,6 @@ func (alloc *rootCoordAllocator) allocTimestamp(ctx context.Context) (Timestamp, Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestTSO), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), Count: 1, @@ -71,7 +70,6 @@ func (alloc *rootCoordAllocator) allocID(ctx context.Context) (UniqueID, error) Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestID), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), Count: 1, diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go index 21096b3ea3..cc30084e6b 100644 --- a/internal/datacoord/server.go +++ b/internal/datacoord/server.go @@ -877,7 +877,6 @@ func (s *Server) loadCollectionFromRootCoord(ctx context.Context, collectionID i Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_ShowPartitions), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), DbName: "", diff --git a/internal/datanode/allocator.go b/internal/datanode/allocator.go index e86025e8fc..2b816220e8 100644 --- a/internal/datanode/allocator.go +++ b/internal/datanode/allocator.go @@ -54,8 +54,7 @@ func (alloc *allocator) allocID() (UniqueID, error) { resp, err := alloc.rootCoord.AllocID(ctx, &rootcoordpb.AllocIDRequest{ Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestID), - commonpbutil.WithMsgID(1), // GOOSE TODO - commonpbutil.WithTimeStamp(0), // GOOSE TODO + commonpbutil.WithMsgID(1), // GOOSE TODO commonpbutil.WithSourceID(paramtable.GetNodeID()), ), Count: 1, diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index af6aa9324b..d67ee8e60d 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -484,7 +484,6 @@ func (node *DataNode) Start() error { Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestTSO), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), Count: 1, @@ -1022,7 +1021,6 @@ func (node *DataNode) Import(ctx context.Context, req *datapb.ImportTaskRequest) Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestTSO), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), Count: 1, diff --git a/internal/datanode/data_sync_service.go b/internal/datanode/data_sync_service.go index e2f8207a8b..60ce0724bd 100644 --- a/internal/datanode/data_sync_service.go +++ b/internal/datanode/data_sync_service.go @@ -367,7 +367,6 @@ func (dsService *dataSyncService) getSegmentInfos(segmentIDs []int64) ([]*datapb Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_SegmentInfo), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), SegmentIDs: segmentIDs, diff --git a/internal/datanode/flush_manager.go b/internal/datanode/flush_manager.go index 26c1fb9b88..c6de016c99 100644 --- a/internal/datanode/flush_manager.go +++ b/internal/datanode/flush_manager.go @@ -639,9 +639,8 @@ func dropVirtualChannelFunc(dsService *dataSyncService, opts ...retry.Option) fl return func(packs []*segmentFlushPack) { req := &datapb.DropVirtualChannelRequest{ Base: commonpbutil.NewMsgBase( - commonpbutil.WithMsgType(0), //TODO msg type - commonpbutil.WithMsgID(0), //TODO msg id - commonpbutil.WithTimeStamp(0), //TODO time stamp + commonpbutil.WithMsgType(0), //TODO msg type + commonpbutil.WithMsgID(0), //TODO msg id commonpbutil.WithSourceID(paramtable.GetNodeID()), ), ChannelName: dsService.vchannelName, @@ -794,7 +793,6 @@ func flushNotifyFunc(dsService *dataSyncService, opts ...retry.Option) notifyMet Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(0), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), SegmentID: pack.segmentID, diff --git a/internal/datanode/meta_service.go b/internal/datanode/meta_service.go index 16bbd0d65d..baf2f97217 100644 --- a/internal/datanode/meta_service.go +++ b/internal/datanode/meta_service.go @@ -62,8 +62,7 @@ func (mService *metaService) getCollectionInfo(ctx context.Context, collID Uniqu req := &milvuspb.DescribeCollectionRequest{ Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_DescribeCollection), - commonpbutil.WithMsgID(0), //GOOSE TODO - commonpbutil.WithTimeStamp(0), //GOOSE TODO + commonpbutil.WithMsgID(0), //GOOSE TODO commonpbutil.WithSourceID(paramtable.GetNodeID()), ), DbName: "default", // GOOSE TODO diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index 8302f60825..6dd2b0cee8 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -1518,7 +1518,6 @@ func (node *Proxy) GetLoadingProgress(ctx context.Context, request *milvuspb.Get msgBase := commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_SystemInfo), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ) if request.Base == nil { @@ -2832,7 +2831,6 @@ func (node *Proxy) GetPersistentSegmentInfo(ctx context.Context, req *milvuspb.G Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_SegmentInfo), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), SegmentIDs: getSegmentsByStatesResponse.Segments, @@ -2909,7 +2907,6 @@ func (node *Proxy) GetQuerySegmentInfo(ctx context.Context, req *milvuspb.GetQue Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_SegmentInfo), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), CollectionID: collID, @@ -3085,7 +3082,6 @@ func (node *Proxy) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsReque req.Base = commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_SystemInfo), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ) if metricType == metricsinfo.SystemInfoMetrics { @@ -3162,7 +3158,6 @@ func (node *Proxy) GetProxyMetrics(ctx context.Context, req *milvuspb.GetMetrics req.Base = commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_SystemInfo), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ) @@ -3228,7 +3223,6 @@ func (node *Proxy) LoadBalance(ctx context.Context, req *milvuspb.LoadBalanceReq Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_LoadBalanceSegments), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(paramtable.GetNodeID()), ), SourceNodeIDs: []int64{req.SrcNodeID}, diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 4d6bd5d454..6244ac77fa 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -305,7 +305,6 @@ func (node *Proxy) sendChannelsTimeTickLoop() { Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_TimeTick), // todo commonpbutil.WithMsgID(0), // todo - commonpbutil.WithTimeStamp(0), // todo commonpbutil.WithSourceID(node.session.ServerID), ), ChannelNames: channels, diff --git a/internal/proxy/timestamp.go b/internal/proxy/timestamp.go index 3c887d5072..c755f67832 100644 --- a/internal/proxy/timestamp.go +++ b/internal/proxy/timestamp.go @@ -54,7 +54,6 @@ func (ta *timestampAllocator) alloc(count uint32) ([]Timestamp, error) { Base: commonpbutil.NewMsgBase( commonpbutil.WithMsgType(commonpb.MsgType_RequestTSO), commonpbutil.WithMsgID(0), - commonpbutil.WithTimeStamp(0), commonpbutil.WithSourceID(ta.peerID), ), Count: count,