admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 17:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix standalone seek hang after restart (#6073)

Browse Source 
Signed-off-by: fishpenguin <kun.yu@zilliz.com>
This commit is contained in:
yukun 2021-06-24 16:44:07 +08:00 committed by GitHub
parent 710e2ca185
commit 0f409da136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/msgstream/mq_msgstream.go
View File

@ -392,15 +392,16 @@ func (ms *mqMsgStream) Seek(msgPositions []*internalpb.MsgPosition) error {
if err != nil { if err != nil {
return err return err
} }
msg, ok := <-consumer.Chan() if _, ok := consumer.(*mqclient.RmqConsumer); !ok {
if !ok { msg, ok := <-consumer.Chan()
return errors.New("consumer closed") if !ok {
} return errors.New("consumer closed")
consumer.Ack(msg) }
consumer.Ack(msg)
if !bytes.Equal(msg.ID().Serialize(), messageID.Serialize()) { if !bytes.Equal(msg.ID().Serialize(), messageID.Serialize()) {
err = fmt.Errorf("seek msg not correct") err = fmt.Errorf("seek msg not correct")
log.Error("msMsgStream seek", zap.Error(err)) log.Error("msMsgStream seek", zap.Error(err))
}
} }
return nil return nil

5
internal/proxy/impl.go
View File

@ -1450,6 +1450,11 @@ func (node *Proxy) Query(ctx context.Context, request *milvuspb.QueryRequest) (*
return nil, err return nil, err
} }
if request.Expr == "" {
errMsg := "Query expression is empty!"
return nil, fmt.Errorf(errMsg)
}
parseRetrieveTask := func(exprString string) ([]int64, error) { parseRetrieveTask := func(exprString string) ([]int64, error) {
expr, err := parseQueryExpr(schema, exprString) expr, err := parseQueryExpr(schema, exprString)
if err != nil { if err != nil {

2
internal/util/mqclient/rmq_client.go
View File

@ -55,7 +55,7 @@ func (rc *rmqClient) Subscribe(options ConsumerOptions) (Consumer, error) {
return nil, err return nil, err
} }
rConsumer := &rmqConsumer{c: cli} rConsumer := &RmqConsumer{c: cli}
return rConsumer, nil return rConsumer, nil
} }

12
internal/util/mqclient/rmq_consumer.go
View File

@ -15,16 +15,16 @@ import (
"github.com/milvus-io/milvus/internal/util/rocksmq/client/rocksmq" "github.com/milvus-io/milvus/internal/util/rocksmq/client/rocksmq"
) )
type rmqConsumer struct { type RmqConsumer struct {
c rocksmq.Consumer c rocksmq.Consumer
msgChannel chan ConsumerMessage msgChannel chan ConsumerMessage
} }
func (rc *rmqConsumer) Subscription() string { func (rc *RmqConsumer) Subscription() string {
return rc.c.Subscription() return rc.c.Subscription()
} }
func (rc *rmqConsumer) Chan() <-chan ConsumerMessage { func (rc *RmqConsumer) Chan() <-chan ConsumerMessage {
if rc.msgChannel == nil { if rc.msgChannel == nil {
rc.msgChannel = make(chan ConsumerMessage) rc.msgChannel = make(chan ConsumerMessage)
@ -44,13 +44,13 @@ func (rc *rmqConsumer) Chan() <-chan ConsumerMessage {
return rc.msgChannel return rc.msgChannel
} }
func (rc *rmqConsumer) Seek(id MessageID) error { func (rc *RmqConsumer) Seek(id MessageID) error {
msgID := id.(*rmqID).messageID msgID := id.(*rmqID).messageID
return rc.c.Seek(msgID) return rc.c.Seek(msgID)
} }
func (rc *rmqConsumer) Ack(message ConsumerMessage) { func (rc *RmqConsumer) Ack(message ConsumerMessage) {
} }
func (rc *rmqConsumer) Close() { func (rc *RmqConsumer) Close() {
} }