This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 049430e9f9b KAFKA-18927 Remove LATEST_0_11, LATEST_1_0, LATEST_1_1,
LATEST_2_0 (#19134)
049430e9f9b is described below
commit 049430e9f9b69f85de473826a614527e7981422e
Author: Parker Chang <[email protected]>
AuthorDate: Fri Mar 14 14:09:31 2025 +0800
KAFKA-18927 Remove LATEST_0_11, LATEST_1_0, LATEST_1_1, LATEST_2_0 (#19134)
Revert the following commits:
https://github.com/apache/kafka/commit/2ee7e4d22c942045b960540918edc4960629a8a2
https://github.com/apache/kafka/commit/d1952e854202c574c1c19a48b17cc00e9d2eccd5
Reviewers: Matthias J. Sax <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
tests/docker/Dockerfile | 10 ----------
tests/kafkatest/tests/streams/streams_upgrade_test.py | 16 +++++-----------
tests/kafkatest/utils/util.py | 2 +-
tests/kafkatest/version.py | 16 ----------------
vagrant/base.sh | 10 ----------
5 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index 7dce5ef86d8..62fa67c8e31 100644
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@@ -78,12 +78,6 @@ RUN echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config
# Install binary test dependencies.
# we use the same versions as in vagrant/base.sh
ARG KAFKA_MIRROR="https://s3-us-west-2.amazonaws.com/kafka-packages";
-# The versions between 0.11.0.3 and 2.0.1 are used to run client code, because
zookeeper in these versions is not compatible with JDK 17.
-# See KAFKA-17888 for more details.
-RUN mkdir -p "/opt/kafka-0.11.0.3" && chmod a+rw /opt/kafka-0.11.0.3 && curl
-s "$KAFKA_MIRROR/kafka_2.11-0.11.0.3.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-0.11.0.3"
-RUN mkdir -p "/opt/kafka-1.0.2" && chmod a+rw /opt/kafka-1.0.2 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.0.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-1.0.2"
-RUN mkdir -p "/opt/kafka-1.1.1" && chmod a+rw /opt/kafka-1.1.1 && curl -s
"$KAFKA_MIRROR/kafka_2.11-1.1.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-1.1.1"
-RUN mkdir -p "/opt/kafka-2.0.1" && chmod a+rw /opt/kafka-2.0.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-2.0.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-2.0.1"
RUN mkdir -p "/opt/kafka-2.1.1" && chmod a+rw /opt/kafka-2.1.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-2.1.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-2.1.1"
RUN mkdir -p "/opt/kafka-2.2.2" && chmod a+rw /opt/kafka-2.2.2 && curl -s
"$KAFKA_MIRROR/kafka_2.12-2.2.2.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-2.2.2"
RUN mkdir -p "/opt/kafka-2.3.1" && chmod a+rw /opt/kafka-2.3.1 && curl -s
"$KAFKA_MIRROR/kafka_2.12-2.3.1.tgz" | tar xz --strip-components=1 -C
"/opt/kafka-2.3.1"
@@ -105,10 +99,6 @@ RUN mkdir -p "/opt/kafka-3.9.0" && chmod a+rw
/opt/kafka-3.9.0 && curl -s "$KAFK
# Streams test dependencies
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-0.11.0.3-test.jar" -o
/opt/kafka-0.11.0.3/libs/kafka-streams-0.11.0.3-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.0.2-test.jar" -o
/opt/kafka-1.0.2/libs/kafka-streams-1.0.2-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-1.1.1-test.jar" -o
/opt/kafka-1.1.1/libs/kafka-streams-1.1.1-test.jar
-RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.0.1-test.jar" -o
/opt/kafka-2.0.1/libs/kafka-streams-2.0.1-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.1.1-test.jar" -o
/opt/kafka-2.1.1/libs/kafka-streams-2.1.1-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.2.2-test.jar" -o
/opt/kafka-2.2.2/libs/kafka-streams-2.2.2-test.jar
RUN curl -s "$KAFKA_MIRROR/kafka-streams-2.3.1-test.jar" -o
/opt/kafka-2.3.1/libs/kafka-streams-2.3.1-test.jar
diff --git a/tests/kafkatest/tests/streams/streams_upgrade_test.py
b/tests/kafkatest/tests/streams/streams_upgrade_test.py
index f44680f2b43..fe6ad8ae16c 100644
--- a/tests/kafkatest/tests/streams/streams_upgrade_test.py
+++ b/tests/kafkatest/tests/streams/streams_upgrade_test.py
@@ -22,10 +22,9 @@ from kafkatest.services.kafka import KafkaService, quorum
from kafkatest.services.streams import StreamsSmokeTestDriverService,
StreamsSmokeTestJobRunnerService, \
StreamsUpgradeTestJobRunnerService
from kafkatest.tests.streams.utils import extract_generation_from_logs,
extract_generation_id
-from kafkatest.version import (LATEST_0_11, LATEST_1_0, LATEST_1_1,
- LATEST_2_0, LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4, LATEST_2_5,
LATEST_2_6, LATEST_2_7, LATEST_2_8, \
+from kafkatest.version import LATEST_2_1, LATEST_2_2, LATEST_2_3, LATEST_2_4,
LATEST_2_5, LATEST_2_6, LATEST_2_7, LATEST_2_8, \
LATEST_3_0, LATEST_3_1, LATEST_3_2, LATEST_3_3, LATEST_3_4, LATEST_3_5,
LATEST_3_6, LATEST_3_7, LATEST_3_8, LATEST_3_9, \
- DEV_BRANCH, DEV_VERSION, KafkaVersion)
+ DEV_BRANCH, DEV_VERSION, KafkaVersion
# broker 0.10.0 is not compatible with newer Kafka Streams versions
# broker 0.10.1 and 0.10.2 do not support headers, as required by suppress()
(since v2.2.1)
@@ -121,12 +120,7 @@ class StreamsUpgradeTest(Test):
else:
extra_properties = {}
- broker_version = DEV_BRANCH
- # the protocol which is used by versions <= LATEST_2_0 are dropped in
4.0, so setting broker version to 3.9
- if KafkaVersion(from_version) < LATEST_2_1:
- broker_version = LATEST_3_9
-
- self.set_up_services(version=broker_version)
+ self.set_up_services()
self.driver.start()
@@ -218,8 +212,8 @@ class StreamsUpgradeTest(Test):
self.stop_and_await()
- def set_up_services(self, version=DEV_BRANCH):
- self.kafka = KafkaService(self.test_context, num_nodes=1, zk=None,
topics=self.topics, version=version)
+ def set_up_services(self):
+ self.kafka = KafkaService(self.test_context, num_nodes=1, zk=None,
topics=self.topics)
self.kafka.start()
self.driver = StreamsSmokeTestDriverService(self.test_context,
self.kafka)
diff --git a/tests/kafkatest/utils/util.py b/tests/kafkatest/utils/util.py
index 4739709c6c4..4affe1975a6 100644
--- a/tests/kafkatest/utils/util.py
+++ b/tests/kafkatest/utils/util.py
@@ -58,7 +58,7 @@ def is_version(node, version_list, proc_grep_string="kafka",
logger=None):
A useful tool to aid in checking that service version apis are working
correctly.
"""
lines = [l for l in node.account.ssh_capture("ps ax | grep %s | grep -v
grep" % proc_grep_string)]
- assert len(lines) == 1
+ assert len(lines) == 1, "lines: %s" % lines
psLine = lines[0]
versions = _kafka_jar_versions(psLine)
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 44fe03630d1..31b890c5b65 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -116,22 +116,6 @@ LATEST_STABLE_TRANSACTION_VERSION = 2
# This should match the LATEST_PRODUCTION version defined in
MetadataVersion.java
LATEST_STABLE_METADATA_VERSION = "4.0-IV3"
-# 0.11.0.x versions
-V_0_11_0_3 = KafkaVersion("0.11.0.3")
-LATEST_0_11 = V_0_11_0_3
-
-# 1.0.x versions
-V_1_0_2 = KafkaVersion("1.0.2")
-LATEST_1_0 = V_1_0_2
-
-# 1.1.x versions
-V_1_1_1 = KafkaVersion("1.1.1")
-LATEST_1_1 = V_1_1_1
-
-# 2.0.x versions
-V_2_0_1 = KafkaVersion("2.0.1")
-LATEST_2_0 = V_2_0_1
-
# 2.1.x versions
V_2_1_0 = KafkaVersion("2.1.0")
V_2_1_1 = KafkaVersion("2.1.1")
diff --git a/vagrant/base.sh b/vagrant/base.sh
index a589b7c8e96..489808d99c6 100755
--- a/vagrant/base.sh
+++ b/vagrant/base.sh
@@ -114,16 +114,6 @@ apt-get install -y iperf traceroute
# We want to use the latest Scala version per Kafka version
# Previously we could not pull in Scala 2.12 builds, because Scala 2.12
requires Java 8 and we were running the system
# tests with Java 7. We have since switched to Java 8, so 2.0.0 and later use
Scala 2.12.
-# The versions between 0.11.0.3 and 2.0.1 are used to run client code, because
zookeeper in these versions is not compatible with JDK 17.
-# See KAFKA-17888 for more details.
-get_kafka 0.11.0.3 2.11
-chmod a+rw /opt/kafka-0.11.0.3
-get_kafka 1.0.2 2.11
-chmod a+rw /opt/kafka-1.0.2
-get_kafka 1.1.1 2.11
-chmod a+rw /opt/kafka-1.1.1
-get_kafka 2.0.1 2.12
-chmod a+rw /opt/kafka-2.0.1
get_kafka 2.1.1 2.12
chmod a+rw /opt/kafka-2.1.1
get_kafka 2.2.2 2.12
