milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong TriggerCondition When load balance (#11389) 

Signed-off-by: xige-16 <xi.ge@zilliz.com>
pull/11425/head
xige-16 2021-11-08 11:15:04 +08:00 committed by GitHub
parent e46dae139d
commit 96cd9352ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/proxy/proxy_test.go
View File

@ -1340,7 +1340,7 @@ func TestProxy(t *testing.T) {
Base: nil,
})
assert.NoError(t, err)
assert.Equal(t, commonpb.ErrorCode_Success, resp.ErrorCode)
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, resp.ErrorCode)
})
// TODO(dragondriver): dummy

4
internal/querycoord/impl.go
View File

@ -562,7 +562,7 @@ func (qc *QueryCoord) LoadBalance(ctx context.Context, req *querypb.LoadBalanceR
return status, nil
}
baseTask := newBaseTask(qc.loopCtx, querypb.TriggerCondition_grpcRequest)
baseTask := newBaseTask(qc.loopCtx, querypb.TriggerCondition_loadBalance)
loadBalanceTask := &loadBalanceTask{
baseTask: baseTask,
LoadBalanceRequest: req,
@ -582,7 +582,7 @@ func (qc *QueryCoord) LoadBalance(ctx context.Context, req *querypb.LoadBalanceR
if err != nil {
status.ErrorCode = commonpb.ErrorCode_UnexpectedError
status.Reason = err.Error()
return status, nil
return status, err
}
log.Debug("LoadBalanceRequest completed",
zap.String("role", Params.RoleName),

15
internal/querycoord/impl_test.go
View File

@ -189,16 +189,6 @@ func TestGrpcTask(t *testing.T) {
assert.Nil(t, err)
})
t.Run("Test LoadBalance", func(t *testing.T) {
res, err := queryCoord.LoadBalance(ctx, &querypb.LoadBalanceRequest{
Base: &commonpb.MsgBase{
MsgType: commonpb.MsgType_SegmentInfo,
},
})
assert.NoError(t, err)
assert.Equal(t, commonpb.ErrorCode_Success, res.ErrorCode)
})
t.Run("Test ReleaseParOfNotLoadedCol", func(t *testing.T) {
status, err := queryCoord.ReleasePartitions(ctx, &querypb.ReleasePartitionsRequest{
Base: &commonpb.MsgBase{
@ -299,9 +289,8 @@ func TestGrpcTask(t *testing.T) {
MsgType: commonpb.MsgType_LoadBalanceSegments,
},
})
assert.NoError(t, err)
assert.Equal(t, commonpb.ErrorCode_Success, res.ErrorCode)
assert.Nil(t, err)
assert.Equal(t, commonpb.ErrorCode_UnexpectedError, res.ErrorCode)
assert.NotNil(t, err)
})
t.Run("Test GetMetrics", func(t *testing.T) {