Skip to content

Commit 6fde923

Browse files
author
Dana Powers
committed
Add kafka 0.8.2.1 to integration tests, remove 0.8.2.0
1 parent 04cf4b3 commit 6fde923

7 files changed

+177
-8
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
- KAFKA_VERSION=0.8.0
1313
- KAFKA_VERSION=0.8.1
1414
- KAFKA_VERSION=0.8.1.1
15-
- KAFKA_VERSION=0.8.2.0
15+
- KAFKA_VERSION=0.8.2.1
1616

1717
before_install:
1818
- sudo apt-get install libsnappy-dev

build_integration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Versions available for testing via binary distributions
4-
OFFICIAL_RELEASES="0.8.0 0.8.1 0.8.1.1 0.8.2.0"
4+
OFFICIAL_RELEASES="0.8.0 0.8.1 0.8.1.1 0.8.2.1"
55

66
# Useful configuration vars, with sensible defaults
77
if [ -z "$SCALA_VERSION" ]; then
+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# see kafka.server.KafkaConfig for additional details and defaults
16+
17+
############################# Server Basics #############################
18+
19+
# The id of the broker. This must be set to a unique integer for each broker.
20+
broker.id={broker_id}
21+
22+
############################# Socket Server Settings #############################
23+
24+
# The port the socket server listens on
25+
port={port}
26+
27+
# Hostname the broker will bind to. If not set, the server will bind to all interfaces
28+
host.name={host}
29+
30+
# Hostname the broker will advertise to producers and consumers. If not set, it uses the
31+
# value for "host.name" if configured. Otherwise, it will use the value returned from
32+
# java.net.InetAddress.getCanonicalHostName().
33+
#advertised.host.name=<hostname routable by clients>
34+
35+
# The port to publish to ZooKeeper for clients to use. If this is not set,
36+
# it will publish the same port that the broker binds to.
37+
#advertised.port=<port accessible by clients>
38+
39+
# The number of threads handling network requests
40+
num.network.threads=2
41+
42+
# The number of threads doing disk I/O
43+
num.io.threads=8
44+
45+
# The send buffer (SO_SNDBUF) used by the socket server
46+
socket.send.buffer.bytes=1048576
47+
48+
# The receive buffer (SO_RCVBUF) used by the socket server
49+
socket.receive.buffer.bytes=1048576
50+
51+
# The maximum size of a request that the socket server will accept (protection against OOM)
52+
socket.request.max.bytes=104857600
53+
54+
55+
############################# Log Basics #############################
56+
57+
# A comma seperated list of directories under which to store log files
58+
log.dirs={tmp_dir}/data
59+
60+
# The default number of log partitions per topic. More partitions allow greater
61+
# parallelism for consumption, but this will also result in more files across
62+
# the brokers.
63+
num.partitions={partitions}
64+
default.replication.factor={replicas}
65+
66+
## Short Replica Lag -- Drops failed brokers out of ISR
67+
replica.lag.time.max.ms=1000
68+
replica.socket.timeout.ms=1000
69+
70+
############################# Log Flush Policy #############################
71+
72+
# Messages are immediately written to the filesystem but by default we only fsync() to sync
73+
# the OS cache lazily. The following configurations control the flush of data to disk.
74+
# There are a few important trade-offs here:
75+
# 1. Durability: Unflushed data may be lost if you are not using replication.
76+
# 2. Latency: Very large flush intervals may lead to latency spikes when the flush does occur as there will be a lot of data to flush.
77+
# 3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks.
78+
# The settings below allow one to configure the flush policy to flush data after a period of time or
79+
# every N messages (or both). This can be done globally and overridden on a per-topic basis.
80+
81+
# The number of messages to accept before forcing a flush of data to disk
82+
#log.flush.interval.messages=10000
83+
84+
# The maximum amount of time a message can sit in a log before we force a flush
85+
#log.flush.interval.ms=1000
86+
87+
############################# Log Retention Policy #############################
88+
89+
# The following configurations control the disposal of log segments. The policy can
90+
# be set to delete segments after a period of time, or after a given size has accumulated.
91+
# A segment will be deleted whenever *either* of these criteria are met. Deletion always happens
92+
# from the end of the log.
93+
94+
# The minimum age of a log file to be eligible for deletion
95+
log.retention.hours=168
96+
97+
# A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
98+
# segments don't drop below log.retention.bytes.
99+
#log.retention.bytes=1073741824
100+
101+
# The maximum size of a log segment file. When this size is reached a new log segment will be created.
102+
log.segment.bytes=536870912
103+
104+
# The interval at which log segments are checked to see if they can be deleted according
105+
# to the retention policies
106+
log.retention.check.interval.ms=60000
107+
108+
# By default the log cleaner is disabled and the log retention policy will default to just delete segments after their retention expires.
109+
# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs can then be marked for log compaction.
110+
log.cleaner.enable=false
111+
112+
############################# Zookeeper #############################
113+
114+
# Zookeeper connection string (see zookeeper docs for details).
115+
# This is a comma separated host:port pairs, each corresponding to a zk
116+
# server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002".
117+
# You can also append an optional chroot string to the urls to specify the
118+
# root directory for all kafka znodes.
119+
zookeeper.connect={zk_host}:{zk_port}/{zk_chroot}
120+
121+
# Timeout in ms for connecting to zookeeper
122+
zookeeper.connection.timeout.ms=1000000
123+
# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly
124+
zookeeper.session.timeout.ms=500
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
log4j.rootLogger=INFO, stdout
17+
18+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
19+
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
20+
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
21+
22+
log4j.logger.kafka=DEBUG, stdout
23+
log4j.logger.org.I0Itec.zkclient.ZkClient=INFO, stdout
24+
log4j.logger.org.apache.zookeeper=INFO, stdout
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# the directory where the snapshot is stored.
16+
dataDir={tmp_dir}
17+
# the port at which the clients will connect
18+
clientPort={port}
19+
clientPortAddress={host}
20+
# disable the per-ip limit on the number of connections since this is a non-production config
21+
maxClientCnxns=0

test/test_client_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_send_produce_request_maintains_request_response_order(self):
8383
# Offset Tests #
8484
####################
8585

86-
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
86+
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.1")
8787
def test_commit_fetch_offsets(self):
8888
req = OffsetCommitRequest(self.bytes_topic, 0, 42, b"metadata")
8989
(resp,) = self.client.send_offset_commit_request(b"group", [req])

test/test_consumer_integration.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_simple_consumer_no_reset(self):
132132
with self.assertRaises(OffsetOutOfRangeError):
133133
consumer.get_message()
134134

135-
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
135+
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.1")
136136
def test_simple_consumer_load_initial_offsets(self):
137137
self.send_messages(0, range(0, 100))
138138
self.send_messages(1, range(100, 200))
@@ -276,7 +276,7 @@ def test_multi_proc_pending(self):
276276

277277
consumer.stop()
278278

279-
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
279+
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.1")
280280
def test_multi_process_consumer_load_initial_offsets(self):
281281
self.send_messages(0, range(0, 10))
282282
self.send_messages(1, range(10, 20))
@@ -342,7 +342,7 @@ def test_huge_messages(self):
342342

343343
big_consumer.stop()
344344

345-
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
345+
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.1")
346346
def test_offset_behavior__resuming_behavior(self):
347347
self.send_messages(0, range(0, 100))
348348
self.send_messages(1, range(100, 200))
@@ -369,7 +369,7 @@ def test_offset_behavior__resuming_behavior(self):
369369
consumer1.stop()
370370
consumer2.stop()
371371

372-
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
372+
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.1")
373373
def test_multi_process_offset_behavior__resuming_behavior(self):
374374
self.send_messages(0, range(0, 100))
375375
self.send_messages(1, range(100, 200))
@@ -477,7 +477,7 @@ def test_kafka_consumer__blocking(self):
477477
self.assertEqual(len(messages), 5)
478478
self.assertGreaterEqual(t.interval, TIMEOUT_MS / 1000.0 )
479479

480-
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.0")
480+
@kafka_versions("0.8.1", "0.8.1.1", "0.8.2.1")
481481
def test_kafka_consumer__offset_commit_resume(self):
482482
GROUP_ID = random_string(10).encode('utf-8')
483483

0 commit comments

Comments
 (0)