Fix sync partition context deadline exceeded (#24479)

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/24500/head
yihao.dai 2023-05-29 20:55:28 +08:00 committed by GitHub
parent 29ae1229b6
commit d8ad09b710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions

View File

@ -159,7 +159,7 @@ func (job *LoadCollectionJob) Execute() error {
}
// 3. loadPartitions on QueryNodes
err = loadPartitions(job.ctx, job.meta, job.cluster, job.broker, req.GetCollectionID(), lackPartitionIDs...)
err = loadPartitions(job.ctx, job.meta, job.cluster, job.broker, true, req.GetCollectionID(), lackPartitionIDs...)
if err != nil {
return err
}
@ -332,7 +332,7 @@ func (job *LoadPartitionJob) Execute() error {
}
// 3. loadPartitions on QueryNodes
err = loadPartitions(job.ctx, job.meta, job.cluster, job.broker, req.GetCollectionID(), lackPartitionIDs...)
err = loadPartitions(job.ctx, job.meta, job.cluster, job.broker, true, req.GetCollectionID(), lackPartitionIDs...)
if err != nil {
return err
}

View File

@ -74,7 +74,7 @@ func (job *SyncNewCreatedPartitionJob) Execute() error {
zap.Int64("partitionID", req.GetPartitionID()),
)
err := loadPartitions(job.ctx, job.meta, job.cluster, job.broker, req.GetCollectionID(), req.GetPartitionID())
err := loadPartitions(job.ctx, job.meta, job.cluster, job.broker, false, req.GetCollectionID(), req.GetPartitionID())
if err != nil {
return err
}

View File

@ -24,6 +24,7 @@ import (
"go.uber.org/zap"
"github.com/milvus-io/milvus-proto/go-api/commonpb"
"github.com/milvus-io/milvus-proto/go-api/schemapb"
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/querycoordv2/meta"
"github.com/milvus-io/milvus/internal/querycoordv2/session"
@ -62,11 +63,16 @@ func loadPartitions(ctx context.Context,
meta *meta.Meta,
cluster session.Cluster,
broker meta.Broker,
withSchema bool,
collection int64,
partitions ...int64) error {
schema, err := broker.GetCollectionSchema(ctx, collection)
if err != nil {
return err
var err error
var schema *schemapb.CollectionSchema
if withSchema {
schema, err = broker.GetCollectionSchema(ctx, collection)
if err != nil {
return err
}
}
indexes, err := broker.DescribeIndex(ctx, collection)
if err != nil {