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

fix: queue to exit when mq processing msg panic #1057

Merged
merged 2 commits into from
Jan 26, 2024
Merged

fix: queue to exit when mq processing msg panic #1057

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
757efd5
fix queue to exit when mq processing msg panic
Jan 26, 2024
b67726d
fix queue to exit when mq processing msg panic
Jan 26, 2024
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
27 changes: 20 additions & 7 deletions pkg/client/rocketmq/push_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ package rocketmq

import (
"context"
"errors"
"runtime/debug"

"github.com/apache/rocketmq-client-go/v2"
"github.com/apache/rocketmq-client-go/v2/consumer"
Expand Down Expand Up @@ -102,7 +104,14 @@ func (cc *PushConsumer) RegisterSingleMessage(f func(context.Context, *primitive
semconv.MessagingRocketmqConsumptionModelKey.String(cc.MessageModel),
}

fn := func(ctx context.Context, msgs ...*primitive.MessageExt) (consumer.ConsumeResult, error) {
fn := func(ctx context.Context, msgs ...*primitive.MessageExt) (result consumer.ConsumeResult, err error) {
// the recover to prevent panic from causing the coroutine to exit when processing msg.
defer func() {
if r := recover(); r != nil {
xlog.Jupiter().Error("consumer message panic", zap.String("stack", string(debug.Stack())))
result, err = consumer.ConsumeRetryLater, errors.New("consumer message panic")
}
}()
for _, msg := range msgs {
var (
span trace.Span
Expand Down Expand Up @@ -135,8 +144,7 @@ func (cc *PushConsumer) RegisterSingleMessage(f func(context.Context, *primitive
}
}

err := f(ctx, msg)
if err != nil {
if err := f(ctx, msg); err != nil {
xlog.Jupiter().Error("consumer message", zap.Error(err), zap.String("field", cc.name), zap.Any("ext", msg))
if cc.EnableTrace && span != nil {
span.RecordError(err)
Expand All @@ -158,8 +166,14 @@ func (cc *PushConsumer) RegisterBatchMessage(f func(context.Context, ...*primiti

tracer := xtrace.NewTracer(trace.SpanKindConsumer)

fn := func(ctx context.Context, msgs ...*primitive.MessageExt) (consumer.ConsumeResult, error) {

fn := func(ctx context.Context, msgs ...*primitive.MessageExt) (result consumer.ConsumeResult, err error) {
// the recover to prevent panic from causing the coroutine to exit when processing msg.
defer func() {
if r := recover(); r != nil {
xlog.Jupiter().Error("consumer message panic", zap.String("stack", string(debug.Stack())))
result, err = consumer.ConsumeRetryLater, errors.New("consumer message panic")
}
}()
if cc.EnableTrace {
for _, msg := range msgs {
var (
Expand All @@ -186,8 +200,7 @@ func (cc *PushConsumer) RegisterBatchMessage(f func(context.Context, ...*primiti
}
}

err := f(ctx, msgs...)
if err != nil {
if err := f(ctx, msgs...); err != nil {
xlog.Jupiter().Error("consumer batch message", zap.Error(err), zap.String("field", cc.name))
return consumer.ConsumeRetryLater, err
}
Expand Down
Loading