From fec261bc9351a6f43adb82ec7c51ce96c73211ba Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 11 Nov 2024 18:42:00 +0100
Subject: [PATCH] HDDS-11664. Hadoop download failure not reported as error

---
 hadoop-ozone/dev-support/checks/_lib.sh       | 6 +++++-
 hadoop-ozone/dev-support/checks/acceptance.sh | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hadoop-ozone/dev-support/checks/_lib.sh b/hadoop-ozone/dev-support/checks/_lib.sh
index 134c8f53c6e8..48108f2e72bd 100644
--- a/hadoop-ozone/dev-support/checks/_lib.sh
+++ b/hadoop-ozone/dev-support/checks/_lib.sh
@@ -160,7 +160,11 @@ download_hadoop_aws() {
 
   if [[ ! -e "${dir}" ]] || [[ ! -d "${dir}"/src/test/resources ]]; then
     mkdir -p "${dir}"
-    [[ -f "${dir}.tar.gz" ]] || curl -LSs -o "${dir}.tar.gz" https://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}-src.tar.gz
+    if [[ ! -f "${dir}.tar.gz" ]]; then
+      local url="https://archive.apache.org/dist/hadoop/common/hadoop-${HADOOP_VERSION}/hadoop-${HADOOP_VERSION}-src.tar.gz"
+      echo "Downloading Hadoop from ${url}"
+      curl -LSs --fail -o "${dir}.tar.gz" "$url" || return 1
+    fi
     tar -x -z -C "${dir}" --strip-components=3 -f "${dir}.tar.gz" --wildcards 'hadoop-*-src/hadoop-tools/hadoop-aws' || return 1
   fi
 }
diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh b/hadoop-ozone/dev-support/checks/acceptance.sh
index 3425f66605ef..97425587ab94 100755
--- a/hadoop-ozone/dev-support/checks/acceptance.sh
+++ b/hadoop-ozone/dev-support/checks/acceptance.sh
@@ -49,7 +49,10 @@ if [[ "${OZONE_ACCEPTANCE_SUITE}" == "s3a" ]]; then
     export HADOOP_AWS_DIR=${OZONE_ROOT}/target/hadoop-src
   fi
 
-  download_hadoop_aws "${HADOOP_AWS_DIR}"
+  if ! download_hadoop_aws "${HADOOP_AWS_DIR}"; then
+    echo "Failed to download Hadoop ${HADOOP_VERSION}" > "${REPORT_DIR}/summary.txt"
+    exit 1
+  fi
 fi
 
 export OZONE_ACCEPTANCE_SUITE OZONE_ACCEPTANCE_TEST_TYPE