Skip to content

KAFKA-14583: Move ReplicaVerificationTool to tools #14059

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

Merged
mimaison merged 4 commits into from
Jul 26, 2023
Merged

KAFKA-14583: Move ReplicaVerificationTool to tools #14059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4eed791
KAFKA-14583: Move ReplicaVerificationTool to tools
fvaleri Jul 18, 2023
b904cda
Address MM comments
fvaleri Jul 21, 2023
2eef0e6
Remove bootstrap-server option and deprecation warnings
fvaleri Jul 21, 2023
72b7c11
Add shutdown hook thread name
fvaleri Jul 25, 2023
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
2 changes: 1 addition & 1 deletion bin/kafka-replica-verification.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

exec $(dirname $0)/kafka-run-class.sh kafka.tools.ReplicaVerificationTool "$@"
exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.ReplicaVerificationTool "$@"
2 changes: 1 addition & 1 deletion bin/windows/kafka-replica-verification.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.

"%~dp0kafka-run-class.bat" kafka.tools.ReplicaVerificationTool %*
"%~dp0kafka-run-class.bat" org.apache.kafka.tools.ReplicaVerificationTool %*
2 changes: 1 addition & 1 deletion checkstyle/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
<suppress checks="BooleanExpressionComplexity"
files="StreamsResetter.java"/>
<suppress checks="NPathComplexity"
files="(ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier).java"/>
files="(ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier|ReplicaVerificationTool).java"/>
<suppress checks="ImportControl"
files="SignalLogger.java"/>
<suppress checks="IllegalImport"
Expand Down
524 changes: 0 additions & 524 deletions core/src/main/scala/kafka/tools/ReplicaVerificationTool.scala
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions core/src/test/scala/kafka/tools/ReplicaVerificationToolTest.scala
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions tests/kafkatest/services/replica_verification_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,21 @@ def get_lag_for_partition(self, topic, partition):
return lag

def start_cmd(self, node):
cmd = self.path.script("kafka-run-class.sh", node)
cmd += " %s" % self.java_class_name()
cmd += " --broker-list %s --topic-white-list %s --time -2 --report-interval-ms %s" % (self.kafka.bootstrap_servers(self.security_protocol), self.topic, self.report_interval_ms)
cmd = self.path.script("kafka-replica-verification.sh", node)
cmd += " --broker-list %s --topics-include %s --time -2 --report-interval-ms %s" % (self.kafka.bootstrap_servers(self.security_protocol), self.topic, self.report_interval_ms)

cmd += " 2>> /mnt/replica_verification_tool.log | tee -a /mnt/replica_verification_tool.log &"
return cmd

def stop_node(self, node):
node.account.kill_java_processes(self.java_class_name(), clean_shutdown=True,
node.account.kill_java_processes("ReplicaVerificationTool", clean_shutdown=True,
allow_fail=True)

stopped = self.wait_node(node, timeout_sec=self.stop_timeout_sec)
assert stopped, "Node %s: did not stop within the specified timeout of %s seconds" % \
(str(node.account), str(self.stop_timeout_sec))

def clean_node(self, node):
node.account.kill_java_processes(self.java_class_name(), clean_shutdown=False,
node.account.kill_java_processes("ReplicaVerificationTool", clean_shutdown=False,
allow_fail=True)
node.account.ssh("rm -rf /mnt/replica_verification_tool.log", allow_fail=False)

def java_class_name(self):
return "kafka.tools.ReplicaVerificationTool"
Loading