Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(reconsume): subMsgs should be used instead of msgs in consume goroutine #504

Merged
merged 6 commits into from
Jul 8, 2020
Merged

fix(reconsume): subMsgs should be used instead of msgs in consume goroutine #504

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35303f0
fix(producer): update name server address immediately when client sta…
Feb 28, 2020
01ea569
fix(producer): start a producer client after another client, options.…
Mar 4, 2020
97a0bc1
fix(producer): UpdateNameServerAddress shoule be called before produc…
Mar 11, 2020
cd17d7c
fix(producer): log topic name when queryTopicRouteInfoFromServer failed
Mar 11, 2020
8b02821
Merge remote-tracking branch 'remotes/upstream/v2.1.0-rc4' into jj_dev
Jul 1, 2020
94dddfd
fix(reconsume): subMsgs should be used instead of msgs in consume gor…
Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions consumer/push_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ func (pc *pushConsumer) consumeMessageCurrently(pq *processQueue, mq *primitive.
Properties: make(map[string]string),
ConsumerGroup: pc.consumerGroup,
MQ: mq,
Msgs: msgs,
Msgs: subMsgs,
}
ctx := context.Background()
ctx = primitive.WithConsumerCtx(ctx, msgCtx)
Expand Down Expand Up @@ -944,14 +944,14 @@ func (pc *pushConsumer) consumeMessageCurrently(pq *processQueue, mq *primitive.
} else {
increaseConsumeFailedTPS(pc.consumerGroup, mq.Topic, len(subMsgs))
if pc.model == BroadCasting {
for i := 0; i < len(msgs); i++ {
for i := 0; i < len(subMsgs); i++ {
rlog.Warning("BROADCASTING, the message consume failed, drop it", map[string]interface{}{
"message": subMsgs[i],
})
}
} else {
for i := 0; i < len(msgs); i++ {
msg := msgs[i]
for i := 0; i < len(subMsgs); i++ {
msg := subMsgs[i]
if !pc.sendMessageBack(mq.BrokerName, msg, concurrentCtx.DelayLevelWhenNextConsume) {
msg.ReconsumeTimes += 1
msgBackFailed = append(msgBackFailed, msg)
Expand All @@ -973,7 +973,7 @@ func (pc *pushConsumer) consumeMessageCurrently(pq *processQueue, mq *primitive.
} else {
rlog.Warning("processQueue is dropped without process consume result.", map[string]interface{}{
rlog.LogKeyMessageQueue: mq,
"message": msgs,
"message": subMsgs,
})
}
})
Expand Down