(pulsar) branch master updated: [fix][build] Upgrade alluxio version to 2.9.3 to fix CVE-2023-38889 (#21715)

[te...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 33313c02089 [fix][build] Upgrade alluxio version to 2.9.3 to fix CVE-2023-38889 (#21715)
33313c02089 is described below

commit 33313c02089e97ee6989bcae4da73cb6434b8fd5
Author: Jiwei Guo <te...@apache.org>
AuthorDate: Thu Dec 14 15:24:33 2023 +0800

    [fix][build] Upgrade alluxio version to 2.9.3 to fix CVE-2023-38889 (#21715)
---
 pulsar-io/alluxio/pom.xml                                          | 2 +-
 .../main/java/org/apache/pulsar/io/alluxio/sink/AlluxioSink.java   | 7 ++++---
 .../java/org/apache/pulsar/io/alluxio/sink/AlluxioSinkTest.java    | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pulsar-io/alluxio/pom.xml b/pulsar-io/alluxio/pom.xml
index 7525f7a6368..47112432a31 100644
--- a/pulsar-io/alluxio/pom.xml
+++ b/pulsar-io/alluxio/pom.xml
@@ -29,7 +29,7 @@
     </parent>
 
     <properties>
-        <alluxio.version>2.7.3</alluxio.version>
+        <alluxio.version>2.9.3</alluxio.version>
         <metrics.version>4.1.11</metrics.version>
         <grpc.version>1.37.0</grpc.version>
     </properties>
diff --git a/pulsar-io/alluxio/src/main/java/org/apache/pulsar/io/alluxio/sink/AlluxioSink.java b/pulsar-io/alluxio/src/main/java/org/apache/pulsar/io/alluxio/sink/AlluxioSink.java
index 413f05e0e17..3b72dc9666b 100644
--- a/pulsar-io/alluxio/src/main/java/org/apache/pulsar/io/alluxio/sink/AlluxioSink.java
+++ b/pulsar-io/alluxio/src/main/java/org/apache/pulsar/io/alluxio/sink/AlluxioSink.java
@@ -22,12 +22,13 @@ import alluxio.AlluxioURI;
 import alluxio.client.WriteType;
 import alluxio.client.file.FileOutStream;
 import alluxio.client.file.FileSystem;
+import alluxio.conf.Configuration;
 import alluxio.conf.InstancedConfiguration;
 import alluxio.conf.PropertyKey;
 import alluxio.exception.AlluxioException;
 import alluxio.grpc.CreateFilePOptions;
 import alluxio.grpc.WritePType;
-import alluxio.util.FileSystemOptions;
+import alluxio.util.FileSystemOptionsUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -78,7 +79,7 @@ public class AlluxioSink implements Sink<GenericObject> {
     private AlluxioSinkConfig alluxioSinkConfig;
     private AlluxioState alluxioState;
 
-    private InstancedConfiguration configuration = InstancedConfiguration.defaults();
+    private InstancedConfiguration configuration = Configuration.modifiableGlobal();
 
     private ObjectMapper objectMapper = new ObjectMapper();
 
@@ -205,7 +206,7 @@ public class AlluxioSink implements Sink<GenericObject> {
 
     private void createTmpFile() throws AlluxioException, IOException {
         CreateFilePOptions.Builder optionsBuilder =
-                FileSystemOptions.createFileDefaults(configuration).toBuilder();
+                FileSystemOptionsUtils.createFileDefaults(configuration).toBuilder();
         UUID id = UUID.randomUUID();
         String fileExtension = alluxioSinkConfig.getFileExtension();
         tmpFilePath = tmpFileDirPath + "/" + id.toString() + "_tmp" + fileExtension;
diff --git a/pulsar-io/alluxio/src/test/java/org/apache/pulsar/io/alluxio/sink/AlluxioSinkTest.java b/pulsar-io/alluxio/src/test/java/org/apache/pulsar/io/alluxio/sink/AlluxioSinkTest.java
index 9325a2255ab..bf40581aae1 100644
--- a/pulsar-io/alluxio/src/test/java/org/apache/pulsar/io/alluxio/sink/AlluxioSinkTest.java
+++ b/pulsar-io/alluxio/src/test/java/org/apache/pulsar/io/alluxio/sink/AlluxioSinkTest.java
@@ -22,8 +22,8 @@ import alluxio.AlluxioURI;
 import alluxio.client.WriteType;
 import alluxio.client.file.FileSystem;
 import alluxio.client.file.URIStatus;
+import alluxio.conf.Configuration;
 import alluxio.conf.PropertyKey;
-import alluxio.conf.ServerConfiguration;
 import alluxio.master.LocalAlluxioCluster;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
@@ -237,8 +237,8 @@ public class AlluxioSinkTest {
     private LocalAlluxioCluster setupSingleMasterCluster() throws Exception {
         // Setup and start the local alluxio cluster
         LocalAlluxioCluster cluster = new LocalAlluxioCluster();
-        cluster.initConfiguration(getTestName(getClass().getSimpleName(), LocalAlluxioCluster.DEFAULT_TEST_NAME));
-        ServerConfiguration.set(PropertyKey.USER_FILE_WRITE_TYPE_DEFAULT, WriteType.MUST_CACHE);
+        cluster.initConfiguration(getTestName(getClass().getSimpleName(), "test"));
+        Configuration.set(PropertyKey.USER_FILE_WRITE_TYPE_DEFAULT, WriteType.MUST_CACHE);
         cluster.start();
         return cluster;
     }