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.

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

should not copy sync.Map in loadBalancer #810

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions golang/loadBalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

type PublishingLoadBalancer interface {
TakeMessageQueueByMessageGroup(messageGroup *string) ([]*v2.MessageQueue, error)
TakeMessageQueues(excluded sync.Map, count int) ([]*v2.MessageQueue, error)
TakeMessageQueues(excluded *sync.Map, count int) ([]*v2.MessageQueue, error)
CopyAndUpdate([]*v2.MessageQueue) PublishingLoadBalancer
}

Expand Down Expand Up @@ -63,7 +63,7 @@ func (plb *publishingLoadBalancer) TakeMessageQueueByMessageGroup(messageGroup *
}, nil
}

func (plb *publishingLoadBalancer) TakeMessageQueues(excluded sync.Map, count int) ([]*v2.MessageQueue, error) {
func (plb *publishingLoadBalancer) TakeMessageQueues(excluded *sync.Map, count int) ([]*v2.MessageQueue, error) {
if len(plb.messageQueues) == 0 {
return nil, fmt.Errorf("messageQueues is empty")
}
Expand Down
2 changes: 1 addition & 1 deletion golang/producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (p *defaultProducer) wrapHeartbeatRequest() *v2.HeartbeatRequest {
}

func (p *defaultProducer) takeMessageQueues(plb PublishingLoadBalancer) ([]*v2.MessageQueue, error) {
return plb.TakeMessageQueues(p.isolated, p.getRetryMaxAttempts())
return plb.TakeMessageQueues(&p.isolated, p.getRetryMaxAttempts())
}

func (p *defaultProducer) getPublishingTopicRouteResult(ctx context.Context, topic string) (PublishingLoadBalancer, error) {
Expand Down