admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Deadline Exceeded

Browse Source 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
This commit is contained in:
bigsheeper 2021-03-19 17:50:26 +08:00 committed by yefu.chen
parent a6a31b9371
commit ba65c38d40
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/masterservice/master_service.go
View File

@ -16,12 +16,6 @@ import (
etcdkv "github.com/zilliztech/milvus-distributed/internal/kv/etcd"
"github.com/zilliztech/milvus-distributed/internal/log"
ms "github.com/zilliztech/milvus-distributed/internal/msgstream"
"github.com/zilliztech/milvus-distributed/internal/tso"
"github.com/zilliztech/milvus-distributed/internal/types"
"github.com/zilliztech/milvus-distributed/internal/util/retry"
"github.com/zilliztech/milvus-distributed/internal/util/tsoutil"
"github.com/zilliztech/milvus-distributed/internal/util/typeutil"
"github.com/zilliztech/milvus-distributed/internal/proto/commonpb"
"github.com/zilliztech/milvus-distributed/internal/proto/datapb"
"github.com/zilliztech/milvus-distributed/internal/proto/indexpb"
@ -30,6 +24,11 @@ import (
"github.com/zilliztech/milvus-distributed/internal/proto/milvuspb"
"github.com/zilliztech/milvus-distributed/internal/proto/proxypb"
"github.com/zilliztech/milvus-distributed/internal/proto/querypb"
"github.com/zilliztech/milvus-distributed/internal/tso"
"github.com/zilliztech/milvus-distributed/internal/types"
"github.com/zilliztech/milvus-distributed/internal/util/retry"
"github.com/zilliztech/milvus-distributed/internal/util/tsoutil"
"github.com/zilliztech/milvus-distributed/internal/util/typeutil"
)
// internalpb -> internalpb

2
internal/masterservice/task.go
View File

@ -41,6 +41,8 @@ func (bt *baseReqTask) WaitToFinish() error {
select {
case <-bt.core.ctx.Done():
return errors.New("context done")
case <-bt.ctx.Done():
return errors.New("grpc context done")
case err, ok := <-bt.cv:
if !ok {
return errors.New("notify chan closed")

2
internal/proxynode/condition.go
View File

@ -37,7 +37,7 @@ func (tc *TaskCondition) Ctx() context.Context {
func NewTaskCondition(ctx context.Context) *TaskCondition {
return &TaskCondition{
done: make(chan error),
done: make(chan error, 1),
ctx: ctx,
}
}

6
internal/proxynode/meta_cache.go
View File

@ -158,8 +158,6 @@ func (m *MetaCache) GetPartitionID(ctx context.Context, collectionName string, p
if err == nil {
return partitionID, nil
}
m.mu.Lock()
defer m.mu.Unlock()
req := &milvuspb.ShowPartitionsRequest{
Base: &commonpb.MsgBase{
@ -174,6 +172,10 @@ func (m *MetaCache) GetPartitionID(ctx context.Context, collectionName string, p
if partitions.Status.ErrorCode != commonpb.ErrorCode_Success {
return 0, fmt.Errorf("%s", partitions.Status.Reason)
}
m.mu.Lock()
defer m.mu.Unlock()
if len(partitions.PartitionIDs) != len(partitions.PartitionNames) {
return 0, fmt.Errorf("partition ids len: %d doesn't equal Partition name len %d",
len(partitions.PartitionIDs), len(partitions.PartitionNames))