Add GetFlushState grpc method (#12220)

Update sdk version
Signed-off-by: Nzhenshan.cao <zhenshan.cao@zilliz.com>

internal/core/src/pb/milvus.pb.cc

@@ -2615,7 +2615,7 @@ const char descriptor_table_protodef_milvus_2eproto[] PROTOBUF_SECTION_VARIABLE(
   "\030\001 \001(\0132\033.milvus.proto.common.Status\022\017\n\007f"
   "lushed\030\002 \001(\010*!\n\010ShowType\022\007\n\003All\020\000\022\014\n\010InM"
   "emory\020\001*>\n\017PlaceholderType\022\010\n\004None\020\000\022\020\n\014"
-  "BinaryVector\020d\022\017\n\013FloatVector\020e2\233\036\n\rMilv"
+  "BinaryVector\020d\022\017\n\013FloatVector\020e2\205\037\n\rMilv"
   "usService\022_\n\020CreateCollection\022,.milvus.p"
   "roto.milvus.CreateCollectionRequest\032\033.mi"
   "lvus.proto.common.Status\"\000\022[\n\016DropCollec"
@@ -2687,37 +2687,39 @@ const char descriptor_table_protodef_milvus_2eproto[] PROTOBUF_SECTION_VARIABLE(
   "st\032!.milvus.proto.milvus.QueryResults\"\000\022"
   "d\n\014CalcDistance\022(.milvus.proto.milvus.Ca"
   "lcDistanceRequest\032(.milvus.proto.milvus."
-  "CalcDistanceResults\"\000\022\211\001\n\030GetPersistentS"
-  "egmentInfo\0224.milvus.proto.milvus.GetPers"
-  "istentSegmentInfoRequest\0325.milvus.proto."
-  "milvus.GetPersistentSegmentInfoResponse\""
-  "\000\022z\n\023GetQuerySegmentInfo\022/.milvus.proto."
-  "milvus.GetQuerySegmentInfoRequest\0320.milv"
-  "us.proto.milvus.GetQuerySegmentInfoRespo"
-  "nse\"\000\022P\n\005Dummy\022!.milvus.proto.milvus.Dum"
-  "myRequest\032\".milvus.proto.milvus.DummyRes"
-  "ponse\"\000\022e\n\014RegisterLink\022(.milvus.proto.m"
-  "ilvus.RegisterLinkRequest\032).milvus.proto"
-  ".milvus.RegisterLinkResponse\"\000\022_\n\nGetMet"
-  "rics\022&.milvus.proto.milvus.GetMetricsReq"
-  "uest\032\'.milvus.proto.milvus.GetMetricsRes"
-  "ponse\"\000\022U\n\013LoadBalance\022\'.milvus.proto.mi"
-  "lvus.LoadBalanceRequest\032\033.milvus.proto.c"
-  "ommon.Status\"\000\022w\n\022GetCompactionState\022..m"
-  "ilvus.proto.milvus.GetCompactionStateReq"
-  "uest\032/.milvus.proto.milvus.GetCompaction"
-  "StateResponse\"\000\022q\n\020ManualCompaction\022,.mi"
-  "lvus.proto.milvus.ManualCompactionReques"
-  "t\032-.milvus.proto.milvus.ManualCompaction"
-  "Response\"\000\022\200\001\n\033GetCompactionStateWithPla"
-  "ns\022..milvus.proto.milvus.GetCompactionPl"
-  "ansRequest\032/.milvus.proto.milvus.GetComp"
-  "actionPlansResponse\"\0002u\n\014ProxyService\022e\n"
-  "\014RegisterLink\022(.milvus.proto.milvus.Regi"
-  "sterLinkRequest\032).milvus.proto.milvus.Re"
-  "gisterLinkResponse\"\000B5Z3github.com/milvu"
-  "s-io/milvus/internal/proto/milvuspbb\006pro"
-  "to3"
+  "CalcDistanceResults\"\000\022h\n\rGetFlushState\022)"
+  ".milvus.proto.milvus.GetFlushStateReques"
+  "t\032*.milvus.proto.milvus.GetFlushStateRes"
+  "ponse\"\000\022\211\001\n\030GetPersistentSegmentInfo\0224.m"
+  "ilvus.proto.milvus.GetPersistentSegmentI"
+  "nfoRequest\0325.milvus.proto.milvus.GetPers"
+  "istentSegmentInfoResponse\"\000\022z\n\023GetQueryS"
+  "egmentInfo\022/.milvus.proto.milvus.GetQuer"
+  "ySegmentInfoRequest\0320.milvus.proto.milvu"
+  "s.GetQuerySegmentInfoResponse\"\000\022P\n\005Dummy"
+  "\022!.milvus.proto.milvus.DummyRequest\032\".mi"
+  "lvus.proto.milvus.DummyResponse\"\000\022e\n\014Reg"
+  "isterLink\022(.milvus.proto.milvus.Register"
+  "LinkRequest\032).milvus.proto.milvus.Regist"
+  "erLinkResponse\"\000\022_\n\nGetMetrics\022&.milvus."
+  "proto.milvus.GetMetricsRequest\032\'.milvus."
+  "proto.milvus.GetMetricsResponse\"\000\022U\n\013Loa"
+  "dBalance\022\'.milvus.proto.milvus.LoadBalan"
+  "ceRequest\032\033.milvus.proto.common.Status\"\000"
+  "\022w\n\022GetCompactionState\022..milvus.proto.mi"
+  "lvus.GetCompactionStateRequest\032/.milvus."
+  "proto.milvus.GetCompactionStateResponse\""
+  "\000\022q\n\020ManualCompaction\022,.milvus.proto.mil"
+  "vus.ManualCompactionRequest\032-.milvus.pro"
+  "to.milvus.ManualCompactionResponse\"\000\022\200\001\n"
+  "\033GetCompactionStateWithPlans\022..milvus.pr"
+  "oto.milvus.GetCompactionPlansRequest\032/.m"
+  "ilvus.proto.milvus.GetCompactionPlansRes"
+  "ponse\"\0002u\n\014ProxyService\022e\n\014RegisterLink\022"
+  "(.milvus.proto.milvus.RegisterLinkReques"
+  "t\032).milvus.proto.milvus.RegisterLinkResp"
+  "onse\"\000B5Z3github.com/milvus-io/milvus/in"
+  "ternal/proto/milvuspbb\006proto3"
   ;
 static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_milvus_2eproto_deps[2] = {
   &::descriptor_table_common_2eproto,
@@ -2805,7 +2807,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mil
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_milvus_2eproto_once;
 static bool descriptor_table_milvus_2eproto_initialized = false;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_milvus_2eproto = {
-  &descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 14563,
+  &descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 14669,
   &descriptor_table_milvus_2eproto_once, descriptor_table_milvus_2eproto_sccs, descriptor_table_milvus_2eproto_deps, 77, 2,
   schemas, file_default_instances, TableStruct_milvus_2eproto::offsets,
   file_level_metadata_milvus_2eproto, 77, file_level_enum_descriptors_milvus_2eproto, file_level_service_descriptors_milvus_2eproto,

internal/proto/milvus.proto

@@ -41,6 +41,7 @@ service MilvusService {
   rpc Query(QueryRequest) returns (QueryResults) {}
   rpc CalcDistance(CalcDistanceRequest) returns (CalcDistanceResults) {}
 
+  rpc GetFlushState(GetFlushStateRequest) returns (GetFlushStateResponse) {}
   rpc GetPersistentSegmentInfo(GetPersistentSegmentInfoRequest) returns (GetPersistentSegmentInfoResponse) {}
   rpc GetQuerySegmentInfo(GetQuerySegmentInfoRequest) returns (GetQuerySegmentInfoResponse) {}
 

internal/proxy/impl.go

@@ -2541,6 +2541,7 @@ func (node *Proxy) GetCompactionStateWithPlans(ctx context.Context, req *milvusp
 // GetFlushState gets the flush state of multiple segments
 func (node *Proxy) GetFlushState(ctx context.Context, req *milvuspb.GetFlushStateRequest) (*milvuspb.GetFlushStateResponse, error) {
 	log.Info("received get flush state request", zap.Any("request", req))
+	var err error
 	resp := &milvuspb.GetFlushStateResponse{}
 	if !node.checkHealthy() {
 		resp.Status = unhealthyStatus()
@@ -2548,7 +2549,7 @@ func (node *Proxy) GetFlushState(ctx context.Context, req *milvuspb.GetFlushStat
 		return resp, nil
 	}
 
-	resp, err := node.dataCoord.GetFlushState(ctx, req)
+	resp, err = node.dataCoord.GetFlushState(ctx, req)
 	log.Info("received get flush state response", zap.Any("response", resp))
 	return resp, err
 }

internal/querynode/flow_graph_delete_node.go

@@ -59,7 +59,10 @@ func (dNode *deleteNode) Operate(in []flowgraph.Msg) []flowgraph.Msg {
 				zap.Any("collectionID", delMsg.CollectionID),
 				zap.Any("collectionName", delMsg.CollectionName),
 				zap.Any("pks", delMsg.PrimaryKeys),
-				zap.Any("timestamp", delMsg.Timestamps))
+				zap.Any("timestamp", delMsg.Timestamps),
+				zap.Any("timestampBegin", delMsg.BeginTs()),
+				zap.Any("timestampEnd", delMsg.EndTs()),
+			)
 			processDeleteMessages(dNode.replica, delMsg, delData)
 		}
 	}

internal/querynode/flow_graph_service_time_node.go

@@ -14,11 +14,11 @@ package querynode
 import (
 	"context"
 
-	"go.uber.org/zap"
-
 	"github.com/milvus-io/milvus/internal/log"
 	"github.com/milvus-io/milvus/internal/msgstream"
 	"github.com/milvus-io/milvus/internal/util/flowgraph"
+	"github.com/milvus-io/milvus/internal/util/tsoutil"
+	"go.uber.org/zap"
 )
 
 type serviceTimeNode struct {
@@ -69,12 +69,14 @@ func (stNode *serviceTimeNode) Operate(in []flowgraph.Msg) []flowgraph.Msg {
 	if err != nil {
 		log.Warn(err.Error())
 	}
-	//log.Debug("update tSafe:",
-	//	zap.Int64("tSafe", int64(serviceTimeMsg.timeRange.timestampMax)),
-	//	zap.Any("collectionID", stNode.collectionID),
-	//	zap.Any("id", id),
-	//	zap.Any("channel", stNode.vChannel),
-	//)
+	p, _ := tsoutil.ParseTS(serviceTimeMsg.timeRange.timestampMax)
+	log.Debug("update tSafe:",
+		zap.Any("collectionID", stNode.collectionID),
+		zap.Any("tSafe", serviceTimeMsg.timeRange.timestampMax),
+		zap.Any("tSafe_p", p),
+		zap.Any("id", id),
+		zap.Any("channel", stNode.vChannel),
+	)
 
 	//if err := stNode.sendTimeTick(serviceTimeMsg.timeRange.timestampMax); err != nil {
 	//	log.Warn("Error: send time tick into pulsar channel failed", zap.Error(err))

internal/querynode/param_table.go

@@ -331,6 +331,7 @@ func (p *ParamTable) initMetaRootPath() {
 
 func (p *ParamTable) initGracefulTime() {
 	p.GracefulTime = p.ParseInt64("queryNode.gracefulTime")
+	log.Debug("query node init gracefulTime", zap.Any("gracefulTime", p.GracefulTime))
 }
 
 func (p *ParamTable) initSegcoreChunkRows() {

internal/querynode/query_collection.go

@@ -248,6 +248,12 @@ func (q *queryCollection) waitNewTSafe() (Timestamp, error) {
 			t = ts
 		}
 	}
+	p, _ := tsoutil.ParseTS(t)
+	log.Debug("waitNewTSafe",
+		zap.Any("collectionID", q.collectionID),
+		zap.Any("tSafe", t),
+		zap.Any("tSafe_p", p),
+	)
 	return t, nil
 }
 

tests/python_client/requirements.txt

@@ -12,7 +12,7 @@ allure-pytest==2.7.0
 pytest-print==0.2.1
 pytest-level==0.1.1
 pytest-xdist==2.2.1
-pymilvus==2.0.0rc9.dev14
+pymilvus==2.0.0rc9.dev16
 pytest-rerunfailures==9.1.1
 git+https://github.com/Projectplace/pytest-tags
 ndg-httpsclient