diff --git a/.travis.yml b/.travis.yml index cb4e0ad94..b98aa16b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,6 @@ env: - KAFKA_VERSION=0.10.2.2 - KAFKA_VERSION=0.11.0.3 - KAFKA_VERSION=1.1.1 - - KAFKA_VERSION=2.0.1 - - KAFKA_VERSION=2.1.1 - - KAFKA_VERSION=2.2.0 - - KAFKA_VERSION=2.3.0 - KAFKA_VERSION=2.4.0 - KAFKA_VERSION=2.5.0 diff --git a/build_integration.sh b/build_integration.sh index d91bf7acf..c020b0fe2 100755 --- a/build_integration.sh +++ b/build_integration.sh @@ -1,6 +1,6 @@ #!/bin/bash -: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.0 2.2.1 2.3.0 2.4.0 2.5.0"} +: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0"} : ${SCALA_VERSION:=2.11} : ${DIST_BASE_URL:=https://archive.apache.org/dist/kafka/} : ${KAFKA_SRC_GIT:=https://github.com/apache/kafka.git} diff --git a/kafka/conn.py b/kafka/conn.py index 38ce57fa5..131fb97ec 100644 --- a/kafka/conn.py +++ b/kafka/conn.py @@ -1180,10 +1180,6 @@ def _infer_broker_version_from_api_versions(self, api_versions): ((0, 11, 0), MetadataRequest[4]), ((0, 10, 2), OffsetFetchRequest[2]), ((0, 10, 1), MetadataRequest[2]), - # taken from https://github.com/edenhill/librdkafka/blob/master/src/rdkafka_feature.c#L234 - ((0, 9, 0), ProduceRequest[1]), - ((0, 8, 2), OffsetFetchRequest[1]), - ((0, 8, 1), OffsetFetchRequest[0]), ] # Get the best match of test cases diff --git a/servers/2.2.0/resources/kafka.properties b/servers/2.2.0/resources/kafka.properties deleted file mode 100644 index 5775cfdc4..000000000 --- a/servers/2.2.0/resources/kafka.properties +++ /dev/null @@ -1,147 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# see kafka.server.KafkaConfig for additional details and defaults - -############################# Server Basics ############################# - -# The id of the broker. This must be set to a unique integer for each broker. -broker.id={broker_id} - -############################# Socket Server Settings ############################# - -listeners={transport}://{host}:{port} -security.inter.broker.protocol={transport} - -{sasl_config} - -ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks -ssl.keystore.password=foobar -ssl.key.password=foobar -ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks -ssl.truststore.password=foobar - -authorizer.class.name=kafka.security.auth.SimpleAclAuthorizer -allow.everyone.if.no.acl.found=true - -# The port the socket server listens on -#port=9092 - -# Hostname the broker will bind to. If not set, the server will bind to all interfaces -#host.name=localhost - -# Hostname the broker will advertise to producers and consumers. If not set, it uses the -# value for "host.name" if configured. Otherwise, it will use the value returned from -# java.net.InetAddress.getCanonicalHostName(). -#advertised.host.name= - -# The port to publish to ZooKeeper for clients to use. If this is not set, -# it will publish the same port that the broker binds to. -#advertised.port= - -# The number of threads handling network requests -num.network.threads=3 - -# The number of threads doing disk I/O -num.io.threads=8 - -# The send buffer (SO_SNDBUF) used by the socket server -socket.send.buffer.bytes=102400 - -# The receive buffer (SO_RCVBUF) used by the socket server -socket.receive.buffer.bytes=102400 - -# The maximum size of a request that the socket server will accept (protection against OOM) -socket.request.max.bytes=104857600 - - -############################# Log Basics ############################# - -# A comma seperated list of directories under which to store log files -log.dirs={tmp_dir}/data - -# The default number of log partitions per topic. More partitions allow greater -# parallelism for consumption, but this will also result in more files across -# the brokers. -num.partitions={partitions} -default.replication.factor={replicas} - -## Short Replica Lag -- Drops failed brokers out of ISR -replica.lag.time.max.ms=1000 -replica.socket.timeout.ms=1000 - -############################# Log Flush Policy ############################# - -# Messages are immediately written to the filesystem but by default we only fsync() to sync -# the OS cache lazily. The following configurations control the flush of data to disk. -# There are a few important trade-offs here: -# 1. Durability: Unflushed data may be lost if you are not using replication. -# 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. -# 3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks. -# The settings below allow one to configure the flush policy to flush data after a period of time or -# every N messages (or both). This can be done globally and overridden on a per-topic basis. - -# The number of messages to accept before forcing a flush of data to disk -#log.flush.interval.messages=10000 - -# The maximum amount of time a message can sit in a log before we force a flush -#log.flush.interval.ms=1000 - -############################# Log Retention Policy ############################# - -# The following configurations control the disposal of log segments. The policy can -# be set to delete segments after a period of time, or after a given size has accumulated. -# A segment will be deleted whenever *either* of these criteria are met. Deletion always happens -# from the end of the log. - -# The minimum age of a log file to be eligible for deletion -log.retention.hours=168 - -# A size-based retention policy for logs. Segments are pruned from the log as long as the remaining -# segments don't drop below log.retention.bytes. -#log.retention.bytes=1073741824 - -# The maximum size of a log segment file. When this size is reached a new log segment will be created. -log.segment.bytes=1073741824 - -# The interval at which log segments are checked to see if they can be deleted according -# to the retention policies -log.retention.check.interval.ms=300000 - -# By default the log cleaner is disabled and the log retention policy will default to just delete segments after their retention expires. -# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs can then be marked for log compaction. -log.cleaner.enable=false - -# tune down offset topics to reduce setup time in tests -offsets.commit.timeout.ms=500 -offsets.topic.num.partitions=2 -offsets.topic.replication.factor=1 - -# Allow shorter session timeouts for tests -group.min.session.timeout.ms=1000 - - -############################# Zookeeper ############################# - -# Zookeeper connection string (see zookeeper docs for details). -# This is a comma separated host:port pairs, each corresponding to a zk -# server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002". -# You can also append an optional chroot string to the urls to specify the -# root directory for all kafka znodes. -zookeeper.connect={zk_host}:{zk_port}/{zk_chroot} - -# Timeout in ms for connecting to zookeeper -zookeeper.connection.timeout.ms=30000 -# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly -zookeeper.session.timeout.ms=500 diff --git a/servers/2.2.0/resources/kafka_server_jaas.conf b/servers/2.2.0/resources/kafka_server_jaas.conf deleted file mode 100644 index 18efe4369..000000000 --- a/servers/2.2.0/resources/kafka_server_jaas.conf +++ /dev/null @@ -1,4 +0,0 @@ -KafkaServer {{ - {jaas_config} -}}; -Client {{}}; \ No newline at end of file diff --git a/servers/2.2.0/resources/log4j.properties b/servers/2.2.0/resources/log4j.properties deleted file mode 100644 index b0b76aa79..000000000 --- a/servers/2.2.0/resources/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -log4j.rootLogger=INFO, stdout, logfile - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n - -log4j.appender.logfile=org.apache.log4j.FileAppender -log4j.appender.logfile.File=${kafka.logs.dir}/server.log -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=[%d] %p %m (%c)%n diff --git a/servers/2.2.0/resources/zookeeper.properties b/servers/2.2.0/resources/zookeeper.properties deleted file mode 100644 index e3fd09742..000000000 --- a/servers/2.2.0/resources/zookeeper.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# the directory where the snapshot is stored. -dataDir={tmp_dir} -# the port at which the clients will connect -clientPort={port} -clientPortAddress={host} -# disable the per-ip limit on the number of connections since this is a non-production config -maxClientCnxns=0