From 39fea06f2bca44cc2148e4fda3f72be2dfd6d280 Mon Sep 17 00:00:00 2001
From: Michael Smith <michael.smith@cloudera.com>
Date: Mon, 30 Jan 2023 10:44:30 -0800
Subject: [PATCH] IMPALA-11990: Make actual failures clearer

A hack to cleanup after Hbase fails when services haven't been started
yet (which is always at least once in a CI run) with a large error
message. That error isn't useful and can be misleading for people
reviewing test logs. Suppress it.

Guards data load for Ozone as a usable snapshot is required. Also fixes
a typo in fixed issues.

Change-Id: Idc37d03780fca35427b977524b2b97a6892c88f7
Reviewed-on: http://gerrit.cloudera.org:8080/19459
Reviewed-by: Gabor Kaszab <gaborkaszab@cloudera.com>
Tested-by: Michael Smith <michael.smith@cloudera.com>
---
 docs/topics/impala_fixed_issues.xml | 2 +-
 testdata/bin/create-load-data.sh    | 6 +++---
 testdata/bin/kill-hbase.sh          | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/topics/impala_fixed_issues.xml b/docs/topics/impala_fixed_issues.xml
index f9c88b569..542965d6d 100644
--- a/docs/topics/impala_fixed_issues.xml
+++ b/docs/topics/impala_fixed_issues.xml
@@ -150,7 +150,7 @@ under the License.
         <li><xref href="https://issues.apache.org/jira/browse/IMPALA-8061"
             format="html" scope="external">IMPALA-8061</xref> - Impala correctly
             initializes<codeph> S3_ACCESS_VALIDATED</codeph> variable to zero
-          when <codeph>TARGET_FILESYSTEM=3</codeph>.</li>
+          when <codeph>TARGET_FILESYSTEM=s3</codeph>.</li>
         <li><xref href="https://issues.apache.org/jira/browse/IMPALA-8154"
             format="html" scope="external">IMPALA-8154</xref> - Disabled the
             Kerberos<codeph> auth_to_local</codeph> setting to prevent
diff --git a/testdata/bin/create-load-data.sh b/testdata/bin/create-load-data.sh
index 3c8f6fc51..35b2e8322 100755
--- a/testdata/bin/create-load-data.sh
+++ b/testdata/bin/create-load-data.sh
@@ -136,10 +136,10 @@ elif [ $SKIP_SNAPSHOT_LOAD -eq 0 ]; then
     if [[ "${TARGET_FILESYSTEM}" == "isilon" || "${TARGET_FILESYSTEM}" == "s3" || \
           "${TARGET_FILESYSTEM}" == "local" || "${TARGET_FILESYSTEM}" == "gs" || \
           "${TARGET_FILESYSTEM}" == "cosn" || "${TARGET_FILESYSTEM}" == "oss" || \
-          "${TARGET_FILESYSTEM}" == "obs" ]] ; then
+          "${TARGET_FILESYSTEM}" == "obs" || "${TARGET_FILESYSTEM}" == "ozone" ]] ; then
       echo "ERROR in $0 at line $LINENO: A schema change has been detected in the"
-      echo "metadata, but it cannot be loaded on isilon, s3, gcs, cos, oss or local"
-      echo "and the target file system is ${TARGET_FILESYSTEM}.  Exiting."
+      echo "metadata, but it cannot be loaded on isilon, s3, gcs, cos, oss, obs, ozone,"
+      echo "or local and the target file system is ${TARGET_FILESYSTEM}.  Exiting."
       # Generate an explicit JUnitXML symptom report here for easier triaging
       ${IMPALA_HOME}/bin/generate_junitxml.py --phase=dataload \
           --step=check-schema-diff.sh --error "${SCHEMA_MISMATCH_ERROR}"
diff --git a/testdata/bin/kill-hbase.sh b/testdata/bin/kill-hbase.sh
index 2589d3032..c2fb3759d 100755
--- a/testdata/bin/kill-hbase.sh
+++ b/testdata/bin/kill-hbase.sh
@@ -38,4 +38,5 @@ rm -rf /tmp/hbase-*
 # HACK: Some jobs have seen the HBase master fail to initialize with mesages like:
 # "Master startup cannot progress, in holding-pattern until region onlined."
 # Anecdotally, removing the MasterProcWALs directory avoids the issue.
-hdfs dfs -Dozone.client.failover.max.attempts=3 -rm /hbase/MasterProcWALs/* || true
+hdfs dfs -Dozone.client.failover.max.attempts=3 -rm /hbase/MasterProcWALs/* \
+  >& /dev/null || true