Skip to content
This repository has been archived by the owner on Oct 2, 2020. It is now read-only.

Commit

Permalink
Revert "Pin to sarama cluster without message drain race condition on…
Browse files Browse the repository at this point in the history
… rebalance (#65)" (#66)

This reverts commit d3dfac0.
  • Loading branch information
georgeteo committed Aug 17, 2018
1 parent d3dfac0 commit 4002c9f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: go
sudo: false
go:
- 1.8
- 1.9
go_import_path: github.com/uber-go/kafka-client
cache:
Expand All @@ -14,4 +15,4 @@ script:
- make bench
after_success:
- make cover
- bash <(curl -s https://codecov.io/bash)
- bash <(curl -s https://codecov.io/bash)
20 changes: 11 additions & 9 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import:
- package: github.com/Shopify/sarama
version: ^1
- package: github.com/bsm/sarama-cluster
version: abb0e9f5dd57b5a3167e1472136a84c4b989478b
version: ~2.1.13
- package: github.com/golang/protobuf
version: ^1
testImport:
Expand Down
16 changes: 0 additions & 16 deletions internal/consumer/mocks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,18 +284,6 @@ func (m *mockPartitionedConsumer) Partition() int32 {
return m.id
}

func (m *mockPartitionedConsumer) InitialOffset() int64 {
panic("implement me")
}

func (m *mockPartitionedConsumer) MarkOffset(offset int64, metadata string) {
panic("implement me")
}

func (m *mockPartitionedConsumer) ResetOffset(offset int64, metadata string) {
panic("implement me")
}

func newMockSaramaConsumer() *mockSaramaConsumer {
return &mockSaramaConsumer{
errorC: make(chan error, 1),
Expand Down Expand Up @@ -408,10 +396,6 @@ func newMockSaramaClient() *mockSaramaClient {
}
}

func (m *mockSaramaClient) Controller() (*sarama.Broker, error) {
panic("implement me")
}

func (m *mockSaramaClient) Config() *sarama.Config {
panic("implement me")
}
Expand Down

0 comments on commit 4002c9f

Please sign in to comment.