From 57f70d9324a9d9075dc157c3b7c639d0b8ef2b4d Mon Sep 17 00:00:00 2001 From: Guanghao Zhang Date: Fri, 31 May 2019 09:39:04 +0800 Subject: [PATCH] HBASE-22490 (addendum) Nightly client integration test fails with hadoop-3 --- dev-support/Jenkinsfile | 4 ++-- dev-support/hbase_nightly_pseudo-distributed-test.sh | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 10c3841..99977b3 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -587,7 +587,7 @@ pipeline { --working-dir output-integration/hadoop-3 \ --hbase-client-install hbase-client \ hbase-install \ - hadoop-3/bin/hadoop \ + hadoop-3/bin/mapred \ hadoop-3/share/hadoop/yarn/test/hadoop-yarn-server-tests-*-tests.jar \ hadoop-3/share/hadoop/mapreduce/hadoop-mapreduce-client-jobclient-*-tests.jar \ >output-integration/hadoop-3.log 2>&1 ; then @@ -601,7 +601,7 @@ pipeline { --working-dir output-integration/hadoop-3-shaded \ --hbase-client-install hbase-client \ hbase-install \ - hadoop-3/bin/hadoop \ + hadoop-3/bin/mapred \ hadoop-3/share/hadoop/yarn/test/hadoop-yarn-server-tests-*-tests.jar \ hadoop-3/share/hadoop/mapreduce/hadoop-mapreduce-client-jobclient-*-tests.jar \ >output-integration/hadoop-3-shaded.log 2>&1 ; then diff --git a/dev-support/hbase_nightly_pseudo-distributed-test.sh b/dev-support/hbase_nightly_pseudo-distributed-test.sh index e98c8d9..45d241b 100755 --- a/dev-support/hbase_nightly_pseudo-distributed-test.sh +++ b/dev-support/hbase_nightly_pseudo-distributed-test.sh @@ -276,7 +276,12 @@ trap cleanup EXIT SIGQUIT echo "Starting up Hadoop" -HADOOP_CLASSPATH="${yarn_server_tests_test_jar}" "${hadoop_exec}" jar "${mapred_jobclient_test_jar}" minicluster -format -writeConfig "${working_dir}/hbase-conf/core-site.xml" -writeDetails "${working_dir}/hadoop_cluster_info.json" >"${working_dir}/hadoop_cluster_command.out" 2>"${working_dir}/hadoop_cluster_command.err" & +if [ "${hadoop_version%.*.*}" -gt 2 ]; then + "${hadoop_exec}" minicluster -format -writeConfig "${working_dir}/hbase-conf/core-site.xml" -writeDetails "${working_dir}/hadoop_cluster_info.json" >"${working_dir}/hadoop_cluster_command.out" 2>"${working_dir}/hadoop_cluster_command.err" & +else + HADOOP_CLASSPATH="${yarn_server_tests_test_jar}" "${hadoop_exec}" jar "${mapred_jobclient_test_jar}" minicluster -format -writeConfig "${working_dir}/hbase-conf/core-site.xml" -writeDetails "${working_dir}/hadoop_cluster_info.json" >"${working_dir}/hadoop_cluster_command.out" 2>"${working_dir}/hadoop_cluster_command.err" & +fi + echo "$!" > "${working_dir}/hadoop.pid" sleep_time=2 -- 2.7.4