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 kafka 0.9 #572

Merged
merged 3 commits into from
Nov 26, 2015
Merged

Add kafka 0.9 #572

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
b841795
Add kafka 0.9
eapache Nov 26, 2015
2c40df7
Fix version.satisfies so all tests run against 0.9
eapache Nov 26, 2015
390dbcd
Skip offset tests against 0.9 for now
eapache Nov 26, 2015
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
matrix:
- KAFKA_VERSION=0.8.1.1
- KAFKA_VERSION=0.8.2.2
- KAFKA_VERSION=0.9.0.0

before_install:
- export REPOSITORY_ROOT=${TRAVIS_BUILD_DIR}
Expand Down
5 changes: 5 additions & 0 deletions functional_offset_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package sarama

import (
"os"
"testing"
)

func TestFuncOffsetManager(t *testing.T) {
checkKafkaVersion(t, "0.8.2")
if os.Getenv("KAFKA_VERSION") == "0.9.0.0" {
t.Skip("Offset manager is broken with kafka 0.9 at the moment.")
}

setupFunctionalTest(t)
defer teardownFunctionalTest(t)

Expand Down
2 changes: 2 additions & 0 deletions functional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ func (kv kafkaVersion) satisfies(other kafkaVersion) bool {

if v < ov {
return false
} else if v > ov {
return true
}
}
return true
Expand Down
2 changes: 1 addition & 1 deletion vagrant/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ yes | apt-get install default-jre

export KAFKA_INSTALL_ROOT=/opt
export KAFKA_HOSTNAME=192.168.100.67
export KAFKA_VERSION=0.8.2.2
export KAFKA_VERSION=0.9.0.0
export REPOSITORY_ROOT=/vagrant

sh /vagrant/vagrant/install_cluster.sh
Expand Down
1 change: 1 addition & 0 deletions vagrant/server.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

# The id of the broker. This must be set to a unique integer for each broker.
broker.id=KAFKAID
reserved.broker.max.id=10000

############################# Socket Server Settings #############################

Expand Down