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 7579bd0795 HDDS-10228. Intermittent failure downloading bzip2 from 
sourceware.org (#6111)
7579bd0795 is described below

commit 7579bd079501b673d543768bbad0a98a9b46eb29
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 30 11:24:53 2024 +0100

    HDDS-10228. Intermittent failure downloading bzip2 from sourceware.org 
(#6111)
---
 hadoop-hdds/rocks-native/pom.xml          | 4 +++-
 hadoop-ozone/dev-support/checks/native.sh | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 2170211131..c12ddbb091 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -55,6 +55,7 @@
 
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
+    
<bzip2.url>https://sourceware.org/pub/bzip2/bzip2-${bzip2.version}.tar.gz</bzip2.url>
     <zlib.url>https://zlib.net/fossils/zlib-${zlib.version}.tar.gz</zlib.url>
   </properties>
 
@@ -146,7 +147,7 @@
                   <goal>wget</goal>
                 </goals>
                 <configuration>
-                  
<url>https://sourceware.org/pub/bzip2/bzip2-${bzip2.version}.tar.gz</url>
+                  <url>${bzip2.url}</url>
                   
<outputFileName>bzip2-v${bzip2.version}.tar.gz</outputFileName>
                   
<outputDirectory>${project.build.directory}/bzip2</outputDirectory>
                 </configuration>
@@ -220,6 +221,7 @@
                     <untar 
src="${project.build.directory}/rocksdb/rocksdb-v${rocksdb.version}.tar.gz" 
compression="gzip" dest="${project.build.directory}/rocksdb/" />
                     <untar 
src="${project.build.directory}/zlib/zlib-${zlib.version}.tar.gz" 
compression="gzip" dest="${project.build.directory}/zlib/" />
                     <untar 
src="${project.build.directory}/bzip2/bzip2-v${bzip2.version}.tar.gz" 
compression="gzip" dest="${project.build.directory}/bzip2/" />
+                    <move 
file="${project.build.directory}/bzip2/bzip2-bzip2-${bzip2.version}" 
tofile="${project.build.directory}/bzip2/bzip2-${bzip2.version}" 
failonerror="false" />
                     <untar 
src="${project.build.directory}/lz4/lz4-v${lz4.version}.tar.gz" 
compression="gzip" dest="${project.build.directory}/lz4/" />
                     <untar 
src="${project.build.directory}/snappy/snappy-v${snappy.version}.tar.gz" 
compression="gzip" dest="${project.build.directory}/snappy/" />
                     <untar 
src="${project.build.directory}/zstd/zstd-v${zstd.version}.tar.gz" 
compression="gzip" dest="${project.build.directory}/zstd/" />
diff --git a/hadoop-ozone/dev-support/checks/native.sh 
b/hadoop-ozone/dev-support/checks/native.sh
index 2bfa7733fc..1eeca5c0f3 100755
--- a/hadoop-ozone/dev-support/checks/native.sh
+++ b/hadoop-ozone/dev-support/checks/native.sh
@@ -25,7 +25,14 @@ if [[ -z "${zlib_version}" ]]; then
   exit 1
 fi
 
+bzip2_version=$(mvn -N help:evaluate -Dexpression=bzip2.version -q 
-DforceStdout)
+if [[ -z "${bzip2_version}" ]]; then
+  echo "ERROR bzip2.version not defined in pom.xml"
+  exit 1
+fi
+
 source "${DIR}/junit.sh" -Pnative -Drocks_tools_native \
+  
-Dbzip2.url="https://github.com/libarchive/bzip2/archive/refs/tags/bzip2-${bzip2_version}.tar.gz";
 \
   
-Dzlib.url="https://github.com/madler/zlib/releases/download/v${zlib_version}/zlib-${zlib_version}.tar.gz";
 \
   -DexcludedGroups="unhealthy" \
   "$@"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to