[hbase] branch HBASE-25689 updated: do not verify log4j2.xml

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-25689
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/HBASE-25689 by this push:
     new 851adcf  do not verify log4j2.xml
851adcf is described below

commit 851adcf8d65ff28372943d89b22a3be0cc0a609d
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Mar 22 10:15:29 2021 +0800

    do not verify log4j2.xml
---
 dev-support/hbase_nightly_pseudo-distributed-test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-support/hbase_nightly_pseudo-distributed-test.sh b/dev-support/hbase_nightly_pseudo-distributed-test.sh
index 33b7b52..ec18f7a 100755
--- a/dev-support/hbase_nightly_pseudo-distributed-test.sh
+++ b/dev-support/hbase_nightly_pseudo-distributed-test.sh
@@ -307,7 +307,11 @@ fi
 
 if [ "${hadoop_version%.*.*}" -gt 2 ]; then
   echo "Verifying configs"
-  "${hadoop_exec}" --config "${working_dir}/hbase-conf/" conftest
+  hadoop_conf_files=""
+  for f in "${working_dir}/hbase-conf/*-site.xml"; do
+    hadoop_conf_files="$hadoop_conf_files -conffile $f"
+  done
+  "${hadoop_exec}" --config "${working_dir}/hbase-conf/" conftest $hadoop_conf_files
 fi
 
 if [ -n "${clean}" ]; then