This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 3a18a9d6e5 HDDS-11664. Hadoop download failure not reported as error
(#7421)
3a18a9d6e5 is described below
commit 3a18a9d6e5331e599276ef4e5d2139f21ca1181f
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Nov 13 08:05:57 2024 +0100
HDDS-11664. Hadoop download failure not reported as error (#7421)
---
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 134c8f53c6..48108f2e72 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 3425f66605..97425587ab 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
