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

[ISSUE #1053] fix: support to run multi consumer in one process #1054

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ISSUE #1053] fix: support to run multi consumer in one process #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions consumer/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,6 @@ func (dc *defaultConsumer) start() error {
retryTopic := internal.GetRetryTopic(dc.consumerGroup)
sub := buildSubscriptionData(retryTopic, MessageSelector{TAG, _SubAll})
dc.subscriptionDataTable.Store(retryTopic, sub)

dc.option.ChangeInstanceNameToPID()
dc.storage = NewRemoteOffsetStore(dc.consumerGroup, dc.client, dc.client.GetNameSrv())
} else {
dc.storage = NewLocalFileOffsetStore(dc.consumerGroup, dc.client.ClientID())
Expand Down
6 changes: 5 additions & 1 deletion consumer/pull_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ func NewPullConsumer(options ...Option) (*defaultPullConsumer, error) {

defaultOpts.Namesrv = srvs
dc := &defaultConsumer{
client: internal.GetOrNewRocketMQClient(defaultOpts.ClientOptions, nil),
consumerGroup: utils.WrapNamespace(defaultOpts.Namespace, defaultOpts.GroupName),
cType: _PullConsume,
state: int32(internal.StateCreateJust),
Expand Down Expand Up @@ -153,6 +152,11 @@ func (pc *defaultPullConsumer) Start() error {
err = errors.Wrap(err, "the consumer group option validate fail")
return
}
if pc.model == Clustering {
pc.option.ChangeInstanceNameToPID()
}

pc.client = internal.GetOrNewRocketMQClient(pc.option.ClientOptions, nil)
err = pc.defaultConsumer.client.RegisterConsumer(pc.consumerGroup, pc)
if err != nil {
rlog.Error("defaultPullConsumer the consumer group has been created, specify another one", map[string]interface{}{
Expand Down
7 changes: 5 additions & 2 deletions consumer/push_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func NewPushConsumer(opts ...Option) (*pushConsumer, error) {
}

dc := &defaultConsumer{
client: internal.GetOrNewRocketMQClient(defaultOpts.ClientOptions, nil),
consumerGroup: defaultOpts.GroupName,
cType: _PushConsume,
state: int32(internal.StateCreateJust),
Expand Down Expand Up @@ -149,6 +148,11 @@ func (pc *pushConsumer) Start() error {
return
}

if pc.model == Clustering {
pc.option.ChangeInstanceNameToPID()
}

pc.client = internal.GetOrNewRocketMQClient(pc.option.ClientOptions, nil)
err = pc.client.RegisterConsumer(pc.consumerGroup, pc)
if err != nil {
rlog.Error("the consumer group has been created, specify another one", map[string]interface{}{
Expand All @@ -157,7 +161,6 @@ func (pc *pushConsumer) Start() error {
err = errors2.ErrCreated
return
}

err = pc.defaultConsumer.start()
if err != nil {
return
Expand Down