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

Add some retry logic to more admin client functions #2520

Merged
merged 3 commits into from
Jul 25, 2023
Merged

Add some retry logic to more admin client functions #2520

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7ce32f
fix: add retry logic to DescribeTopics
hindessm Jul 23, 2023
66ef5a9
fix: add retry logic to DescribeCluster
hindessm Jul 23, 2023
aad8cf3
fix: add retry logic to ListPartitionReassignments
hindessm Jul 23, 2023
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
58 changes: 39 additions & 19 deletions admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,27 +273,40 @@ func (ca *clusterAdmin) CreateTopic(topic string, detail *TopicDetail, validateO
}

func (ca *clusterAdmin) DescribeTopics(topics []string) (metadata []*TopicMetadata, err error) {
controller, err := ca.Controller()
if err != nil {
return nil, err
}

request := NewMetadataRequest(ca.conf.Version, topics)
response, err := controller.GetMetadata(request)
var response *MetadataResponse
err = ca.retryOnError(isErrNoController, func() error {
controller, err := ca.Controller()
if err != nil {
return err
}
request := NewMetadataRequest(ca.conf.Version, topics)
response, err = controller.GetMetadata(request)
if isErrNoController(err) {
_, _ = ca.refreshController()
}
return err
})
if err != nil {
return nil, err
}
return response.Topics, nil
}

func (ca *clusterAdmin) DescribeCluster() (brokers []*Broker, controllerID int32, err error) {
controller, err := ca.Controller()
if err != nil {
return nil, int32(0), err
}
var response *MetadataResponse
err = ca.retryOnError(isErrNoController, func() error {
controller, err := ca.Controller()
if err != nil {
return err
}

request := NewMetadataRequest(ca.conf.Version, nil)
response, err := controller.GetMetadata(request)
request := NewMetadataRequest(ca.conf.Version, nil)
response, err = controller.GetMetadata(request)
if isErrNoController(err) {
_, _ = ca.refreshController()
}
return err
})
if err != nil {
return nil, int32(0), err
}
Expand Down Expand Up @@ -543,13 +556,20 @@ func (ca *clusterAdmin) ListPartitionReassignments(topic string, partitions []in

request.AddBlock(topic, partitions)

b, err := ca.Controller()
if err != nil {
return nil, err
}
_ = b.Open(ca.client.Config())
var rsp *ListPartitionReassignmentsResponse
err = ca.retryOnError(isErrNoController, func() error {
b, err := ca.Controller()
if err != nil {
return err
}
_ = b.Open(ca.client.Config())

rsp, err := b.ListPartitionReassignments(request)
rsp, err = b.ListPartitionReassignments(request)
if isErrNoController(err) {
_, _ = ca.refreshController()
}
return err
})

if err == nil && rsp != nil {
return rsp.TopicStatus, nil
Expand Down
Loading