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 encoding of MetadataResponse with version >= 2 #1174

Merged
merged 3 commits into from
Sep 26, 2018
Merged

fix encoding of MetadataResponse with version >= 2 #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d6be4e
fix encoding of MetadataResponse with version >= 2
birdayz Sep 26, 2018
b4a8a4a
add missing error check
birdayz Sep 26, 2018
baa5962
fix race condition in mock async producer
birdayz Sep 26, 2018
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
11 changes: 11 additions & 0 deletions metadata_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ func (r *MetadataResponse) decode(pd packetDecoder, version int16) (err error) {
}

func (r *MetadataResponse) encode(pe packetEncoder) error {
if r.Version >= 3 {
pe.putInt32(r.ThrottleTimeMs)
}

err := pe.putArrayLength(len(r.Brokers))
if err != nil {
return err
Expand All @@ -218,6 +222,13 @@ func (r *MetadataResponse) encode(pe packetEncoder) error {
}
}

if r.Version >= 2 {
err := pe.putNullableString(r.ClusterID)
if err != nil {
return err
}
}

if r.Version >= 1 {
pe.putInt32(r.ControllerID)
}
Expand Down
3 changes: 1 addition & 2 deletions mocks/async_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func NewAsyncProducer(t ErrorReporter, config *sarama.Config) *AsyncProducer {
defer func() {
close(mp.successes)
close(mp.errors)
close(mp.closed)
}()

for msg := range mp.input {
Expand Down Expand Up @@ -86,8 +87,6 @@ func NewAsyncProducer(t ErrorReporter, config *sarama.Config) *AsyncProducer {
mp.t.Errorf("Expected to exhaust all expectations, but %d are left.", len(mp.expectations))
}
mp.l.Unlock()

close(mp.closed)
}()

return mp
Expand Down