(nifi) branch support/nifi-1.x updated: NIFI-11859: Ensure Hazelcast can not join a network when Cluster is NONE

[pvillard]

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

pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 4d097fbfe8 NIFI-11859: Ensure Hazelcast can not join a network when 
Cluster is NONE
4d097fbfe8 is described below

commit 4d097fbfe8668a901317c2ef7981d16e814da9f6
Author: bob <b...@apache.org>
AuthorDate: Tue Feb 20 22:41:08 2024 -0600

    NIFI-11859: Ensure Hazelcast can not join a network when Cluster is NONE
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #8440.
---
 .../services/cachemanager/EmbeddedHazelcastCacheManager.java   |  7 ++++++-
 .../cachemanager/EmbeddedHazelcastCacheManagerTest.java        | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
 
b/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
index d02ef07800..74305f9d25 100644
--- 
a/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
+++ 
b/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
@@ -118,7 +118,12 @@ public class EmbeddedHazelcastCacheManager extends 
IMapBasedHazelcastCacheManage
         config.setClusterName(clusterName);
 
         // If clustering is turned off, we turn off the capability of the 
Hazelcast instance to form a cluster.
-        
tcpIpConfig.setEnabled(!clusteringStrategy.equals(CLUSTER_NONE.getValue()));
+        if(clusteringStrategy.equals(CLUSTER_NONE.getValue())) {
+            tcpIpConfig.setEnabled(false);
+            networkConfig.getJoin().getAutoDetectionConfig().setEnabled(false);
+        } else {
+            tcpIpConfig.setEnabled(true);
+        }
 
         // Multicasting and automatic port increment are explicitly turned off.
         networkConfig.setPort(port);
diff --git 
a/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/test/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManagerTest.java
 
b/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/test/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManagerTest.java
index 0969484e1c..b8b7ebde62 100644
--- 
a/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/test/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManagerTest.java
+++ 
b/nifi-nar-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/test/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManagerTest.java
@@ -16,8 +16,13 @@
  */
 package org.apache.nifi.hazelcast.services.cachemanager;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 import org.junit.jupiter.api.Test;
 
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
+
 public class EmbeddedHazelcastCacheManagerTest extends 
AbstractHazelcastCacheManagerTest {
 
     @Test
@@ -28,6 +33,11 @@ public class EmbeddedHazelcastCacheManagerTest extends 
AbstractHazelcastCacheMan
         setupHazelcastMapCacheClient();
         enableServices();
 
+        HazelcastInstance instance =
+            Hazelcast.getAllHazelcastInstances().stream().findFirst().get();
+
+        
assertFalse(instance.getConfig().getNetworkConfig().getJoin().isAutoDetectionEnabled());
+
         triggerProcessor();
 
         assertSuccessfulTransfer();