From 54a4fbd4f419b0cf03b6a3883a35eba41c7249f9 Mon Sep 17 00:00:00 2001 From: Ewen Cheslack-Postava Date: Mon, 10 Nov 2014 16:55:55 -0800 Subject: [PATCH] KAFKA-1763 Fix validate_index_log to run on the host executing the system tests. --- system_test/utils/kafka_system_test_utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py index 41d511c..bb3785f 100644 --- a/system_test/utils/kafka_system_test_utils.py +++ b/system_test/utils/kafka_system_test_utils.py @@ -2352,9 +2352,9 @@ def validate_index_log(systemTestEnv, testcaseEnv, clusterName="source"): remoteLogSegmentDir = os.path.basename(remoteLogSegmentPathName) logPathName = get_testcase_config_log_dir_pathname(testcaseEnv, "broker", brokerEntityId, "default") localLogSegmentPath = logPathName + "/" + remoteLogSegmentDir - kafkaHome = system_test_utils.get_data_by_lookup_keyval(clusterConfigList, "entity_id", brokerEntityId, "kafka_home") - hostname = system_test_utils.get_data_by_lookup_keyval(clusterConfigList, "entity_id", brokerEntityId, "hostname") - kafkaRunClassBin = kafkaHome + "/bin/kafka-run-class.sh" + # Unlike almost all other Kafka commands, this runs locally on the test driver host + localKafkaHome = os.path.dirname(systemTestEnv.SYSTEM_TEST_BASE_DIR) + localKafkaRunClassBin = localKafkaHome + "/bin/kafka-run-class.sh" # localLogSegmentPath : # .../system_test/mirror_maker_testsuite/testcase_5002/logs/broker-4/kafka_server_4_logs @@ -2382,8 +2382,7 @@ def validate_index_log(systemTestEnv, testcaseEnv, clusterName="source"): # only process index file: *.index if logFile.endswith(".index"): offsetLogSegmentPathName = localLogSegmentPath + "/" + topicPartition + "/" + logFile - cmdStrList = ["ssh " + hostname, - kafkaRunClassBin + " kafka.tools.DumpLogSegments", + cmdStrList = [localKafkaRunClassBin + " kafka.tools.DumpLogSegments", " --file " + offsetLogSegmentPathName, "--verify-index-only 2>&1"] cmdStr = " ".join(cmdStrList) -- 2.1.2