[pulsar] branch master updated: [fix][io] Fix Alluxio sink to respect the alluxioMasterHost property (#19172)

[tison]

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

tison 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 dda14379640 [fix][io] Fix Alluxio sink to respect the 
alluxioMasterHost property (#19172)
dda14379640 is described below

commit dda14379640f46cf58f475efe89afdbc58b22f14
Author: Kengo Seki <sek...@apache.org>
AuthorDate: Wed Jan 11 10:27:58 2023 +0900

    [fix][io] Fix Alluxio sink to respect the alluxioMasterHost property 
(#19172)
---
 .../org/apache/pulsar/io/alluxio/sink/AlluxioSink.java  |  2 +-
 .../apache/pulsar/io/alluxio/sink/AlluxioSinkTest.java  | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

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 542215e6f83..e457d43d2b3 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
@@ -92,7 +92,7 @@ public class AlluxioSink implements Sink<GenericObject> {
         // initialize FileSystem
         String alluxioMasterHost = alluxioSinkConfig.getAlluxioMasterHost();
         int alluxioMasterPort = alluxioSinkConfig.getAlluxioMasterPort();
-        InstancedConfiguration.defaults().set(PropertyKey.MASTER_HOSTNAME, 
alluxioMasterHost);
+        configuration.set(PropertyKey.MASTER_HOSTNAME, alluxioMasterHost);
         configuration.set(PropertyKey.MASTER_RPC_PORT, alluxioMasterPort);
         if (alluxioSinkConfig.getSecurityLoginUser() != null) {
             configuration.set(PropertyKey.SECURITY_LOGIN_USERNAME, 
alluxioSinkConfig.getSecurityLoginUser());
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 366f276ae86..5d464182616 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
@@ -64,6 +64,7 @@ public class AlluxioSinkTest {
 
     protected Map<String, Object> map;
     protected AlluxioSink sink;
+    protected LocalAlluxioCluster cluster;
 
     @Mock
     protected Record<GenericObject> mockRecord;
@@ -86,10 +87,16 @@ public class AlluxioSinkTest {
     }
 
     @BeforeMethod
-    public final void setUp() {
+    public final void setUp() throws Exception {
+        cluster = setupSingleMasterCluster();
+
         map = new HashMap<>();
-        map.put("alluxioMasterHost", "localhost");
-        map.put("alluxioMasterPort", "19998");
+        // alluxioMasterHost should be set via LocalAlluxioCluster#getHostname
+        // instead of using a fixed value "localhost", since it seems that
+        // LocalAlluxioCluster may bind other address than localhost
+        // when the node has multiple network interfaces.
+        map.put("alluxioMasterHost", cluster.getHostname());
+        map.put("alluxioMasterPort", cluster.getMasterRpcPort());
         map.put("alluxioDir", "/pulsar");
         map.put("filePrefix", "prefix");
         map.put("schemaEnable", "true");
@@ -127,8 +134,6 @@ public class AlluxioSinkTest {
 
         String alluxioDir = "/pulsar";
 
-        LocalAlluxioCluster cluster = setupSingleMasterCluster();
-
         sink = new AlluxioSink();
         sink.open(map, mockSinkContext);
 
@@ -156,8 +161,6 @@ public class AlluxioSinkTest {
 
         String alluxioDir = "/pulsar";
 
-        LocalAlluxioCluster cluster = setupSingleMasterCluster();
-
         sink = new AlluxioSink();
         sink.open(map, mockSinkContext);