chore: update to openjdk17 for packaging with hdfs (#17597)

risingwavelabs · Jul 8, 2024 · 10c5aa1 · 10c5aa1
1 parent dd98abf
commit 10c5aa1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ci/scripts/docker-hdfs.sh b/ci/scripts/docker-hdfs.sh
@@ -10,10 +10,10 @@ BUILDKITE_COMMIT="HDFS_$(echo $RANDOM | md5sum | head -c 20;)"
 
 java_home_path=$(uname -m)
 if [ "$arch" = "arm64" ] || [ "$arch" = "aarch64" ]; then
-    java_home_path="/usr/lib/jvm/java-11-openjdk-arm64"
+    java_home_path="/usr/lib/jvm/java-17-openjdk-arm64"
 else
 # x86_64
-    java_home_path="/usr/lib/jvm/java-11-openjdk-amd64"
+    java_home_path="/usr/lib/jvm/java-17-openjdk-amd64"
 fi
 echo $java_home_path
 

diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml
@@ -42,7 +42,6 @@ opendal = { version = "0.47", features = [
     "services-s3",
     "services-webhdfs",
     "services-azfile",
-    # "service-hdfs",
 ] }
 prometheus = { version = "0.13", features = ["process"] }
 reqwest = "0.12.2" # required by opendal

diff --git a/src/object_store/src/object/opendal_engine/hdfs.rs b/src/object_store/src/object/opendal_engine/hdfs.rs
@@ -20,7 +20,7 @@ use opendal::Operator;
 use risingwave_common::config::ObjectStoreConfig;
 
 use super::{EngineType, OpendalObjectStore};
-use crate::object::opendal_engine::ATOMIC_WRITE_DIR;
+// use crate::object::opendal_engine::ATOMIC_WRITE_DIR;
 use crate::object::ObjectResult;
 
 impl OpendalObjectStore {
@@ -43,10 +43,11 @@ impl OpendalObjectStore {
         // Set the name node for hdfs.
         builder.name_node(&namenode);
         builder.root(&root);
-        if config.set_atomic_write_dir {
-            let atomic_write_dir = format!("{}/{}", root, ATOMIC_WRITE_DIR);
-            builder.atomic_write_dir(&atomic_write_dir);
-        }
+        // todo: reopen the following lines after https://github.com/apache/opendal/issues/4867 is resolved.
+        // if config.set_atomic_write_dir {
+        //     let atomic_write_dir = format!("{}/{}", root, ATOMIC_WRITE_DIR);
+        //     builder.atomic_write_dir(&atomic_write_dir);
+        // }
         let op: Operator = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();