KAFKA-17987 Remove assorted ZK-related files (apache#17768)

Remove zookeeper files in bin: - bin/zookeeper-security-migration.sh - bin/zookeeper-server-start.sh - bin/zookeeper-server-stop.sh - bin/zookeeper-shell.sh Remove files used to configure Kafka in zookeeper mode in config: - config/server.properties - config/zookeeper.properties Remove ZK references from all remaining Kafka configuration files. Remove ZK references from all log4j.properties files. Reviewers: Chia-Ping Tsai <chia7712@gmail.com>
JavaKingCr · Nov 13, 2024 · 085b27e · 085b27e
1 parent 9682e63
commit 085b27e
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 311 deletions.
diff --git a/bin/zookeeper-security-migration.sh b/bin/zookeeper-security-migration.sh
diff --git a/bin/zookeeper-server-start.sh b/bin/zookeeper-server-start.sh
diff --git a/bin/zookeeper-server-stop.sh b/bin/zookeeper-server-stop.sh
diff --git a/bin/zookeeper-shell.sh b/bin/zookeeper-shell.sh
diff --git a/config/kraft/broker.properties b/config/kraft/broker.properties
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This configuration file is intended for use in KRaft mode, where
-# Apache ZooKeeper is not present.
-#
-
 ############################# Server Basics #############################
 
 # The role of this server. Setting this puts us in KRaft mode

diff --git a/config/kraft/controller.properties b/config/kraft/controller.properties
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This configuration file is intended for use in KRaft mode, where
-# Apache ZooKeeper is not present.
-#
-
 ############################# Server Basics #############################
 
 # The role of this server. Setting this puts us in KRaft mode

diff --git a/config/kraft/reconfig-server.properties b/config/kraft/reconfig-server.properties
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This configuration file is intended for use in KRaft mode, where
-# Apache ZooKeeper is not present.
-#
-
 ############################# Server Basics #############################
 
 # The role of this server. Setting this puts us in KRaft mode

diff --git a/config/kraft/server.properties b/config/kraft/server.properties
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This configuration file is intended for use in KRaft mode, where
-# Apache ZooKeeper is not present.
-#
-
 ############################# Server Basics #############################
 
 # The role of this server. Setting this puts us in KRaft mode

diff --git a/config/log4j.properties b/config/log4j.properties
@@ -57,9 +57,6 @@ log4j.appender.authorizerAppender.File=${kafka.logs.dir}/kafka-authorizer.log
 log4j.appender.authorizerAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.authorizerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 
-# Change the line below to adjust ZK client logging
-log4j.logger.org.apache.zookeeper=INFO
-
 # Change the two lines below to adjust the general broker logging level (output to server.log and stdout)
 log4j.logger.kafka=INFO
 log4j.logger.org.apache.kafka=INFO

diff --git a/config/server.properties b/config/server.properties
diff --git a/config/zookeeper.properties b/config/zookeeper.properties
diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
@@ -20,6 +20,3 @@ log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
 
 log4j.logger.kafka=WARN
 log4j.logger.org.apache.kafka=WARN
-
-# zkclient can be verbose, during debugging it is common to adjust it separately
-log4j.logger.org.apache.zookeeper=WARN
diff --git a/group-coordinator/src/test/resources/log4j.properties b/group-coordinator/src/test/resources/log4j.properties
@@ -19,4 +19,3 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
 
 log4j.logger.org.apache.kafka=DEBUG
-log4j.logger.org.apache.zookeeper=WARN
diff --git a/metadata/src/test/resources/log4j.properties b/metadata/src/test/resources/log4j.properties
@@ -19,4 +19,3 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
 
 log4j.logger.org.apache.kafka=DEBUG
-log4j.logger.org.apache.zookeeper=WARN
diff --git a/streams/integration-tests/src/test/resources/log4j.properties b/streams/integration-tests/src/test/resources/log4j.properties
@@ -21,7 +21,6 @@ log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
 log4j.logger.kafka=ERROR
 log4j.logger.state.change.logger=ERROR
 log4j.logger.org.apache.kafka=ERROR
-log4j.logger.org.apache.zookeeper=ERROR
 log4j.logger.org.apache.kafka.clients=ERROR
 
 # These are the only logs we will likely ever find anything useful in to debug Streams test failures

diff --git a/streams/src/test/resources/log4j.properties b/streams/src/test/resources/log4j.properties
@@ -21,7 +21,6 @@ log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n
 log4j.logger.kafka=ERROR
 log4j.logger.state.change.logger=ERROR
 log4j.logger.org.apache.kafka=ERROR
-log4j.logger.org.apache.zookeeper=ERROR
 log4j.logger.org.apache.kafka.clients=ERROR
 
 # These are the only logs we will likely ever find anything useful in to debug Streams test failures
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
		log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n

		log4j.logger.org.apache.kafka=DEBUG
		log4j.logger.org.apache.zookeeper=WARN