You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ra...@apache.org on 2026/04/23 15:51:20 UTC
(atlas) 01/04: ATLAS-4764: CuratorFrameWork should work only when HA mode (#587)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch atlas-2.5
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit ee3259b1483123b3f919906f966ad2a3960d0dbd
Author: pareshd <pa...@freestoneinfotech.com>
AuthorDate: Tue Apr 7 12:59:30 2026 +0530
ATLAS-4764: CuratorFrameWork should work only when HA mode (#587)
(cherry picked from commit 2be84e3523d0d5dfd75087f511051e2c46175f05)
---
.../java/org/apache/atlas/ha/HAConfiguration.java | 2 +-
.../org/apache/atlas/ha/HAConfigurationTest.java | 22 ++++++++
.../apache/atlas/web/service/CuratorFactory.java | 4 +-
.../atlas/web/service/CuratorFactoryTest.java | 62 ++++++++++++++++++++++
4 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java b/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
index 4382d429e..896aa3732 100644
--- a/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
+++ b/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
@@ -105,7 +105,7 @@ public final class HAConfiguration {
if (configuration.containsKey(HA_ZOOKEEPER_CONNECT)) {
zkServers = configuration.getStringArray(HA_ZOOKEEPER_CONNECT);
} else {
- zkServers = configuration.getStringArray("atlas.kafka." + ZOOKEEPER_PREFIX + "connect");
+ zkServers = new String[0];
}
String zkRoot = configuration.getString(ATLAS_SERVER_HA_ZK_ROOT_KEY, ATLAS_SERVER_ZK_ROOT_DEFAULT);
diff --git a/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java b/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java
index 66bd2bb34..86d0a50d6 100644
--- a/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java
+++ b/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java
@@ -28,6 +28,8 @@ import org.testng.annotations.Test;
import java.util.List;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -110,4 +112,24 @@ public class HAConfigurationTest {
HAConfiguration.ZookeeperProperties zookeeperProperties = HAConfiguration.getZookeeperProperties(configuration);
assertTrue(zookeeperProperties.hasAuth());
}
+
+ @Test
+ public void testShouldGetZookeeperConnectStringFromHAConfig() {
+ when(configuration.containsKey(HAConfiguration.HA_ZOOKEEPER_CONNECT)).thenReturn(true);
+ when(configuration.getStringArray(HAConfiguration.HA_ZOOKEEPER_CONNECT)).thenReturn(new String[] {"zk1:2181", "zk2:2181"});
+
+ HAConfiguration.ZookeeperProperties zookeeperProperties = HAConfiguration.getZookeeperProperties(configuration);
+
+ assertEquals(zookeeperProperties.getConnectString(), "zk1:2181,zk2:2181");
+ }
+
+ @Test
+ public void testShouldReturnEmptyZookeeperConnectStringWhenMissing() {
+ when(configuration.containsKey(HAConfiguration.HA_ZOOKEEPER_CONNECT)).thenReturn(false);
+
+ HAConfiguration.ZookeeperProperties zookeeperProperties = HAConfiguration.getZookeeperProperties(configuration);
+
+ assertEquals(zookeeperProperties.getConnectString(), "");
+ verify(configuration, never()).getStringArray("atlas.kafka." + HAConfiguration.ZOOKEEPER_PREFIX + "connect");
+ }
}
diff --git a/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java b/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java
index 515333ef3..7a390f498 100644
--- a/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java
+++ b/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java
@@ -75,7 +75,9 @@ public class CuratorFactory {
public CuratorFactory(Configuration configuration) {
this.configuration = configuration;
- initializeCuratorFramework();
+ if (configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY) && configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)) {
+ initializeCuratorFramework();
+ }
}
/**
diff --git a/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java b/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java
index 396db2f68..58aef3e0c 100644
--- a/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java
@@ -135,6 +135,9 @@ public class CuratorFactoryTest {
@Test
public void testClientInstance() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(true);
+ when(configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)).thenReturn(true);
+
CuratorFactory curatorFactory = new CuratorFactory(configuration) {
@Override
protected void initializeCuratorFramework() {
@@ -154,6 +157,9 @@ public class CuratorFactoryTest {
@Test
public void testLeaderLatchInstance() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(true);
+ when(configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)).thenReturn(true);
+
CuratorFactory curatorFactory = new CuratorFactory(configuration) {
@Override
protected void initializeCuratorFramework() {
@@ -176,6 +182,9 @@ public class CuratorFactoryTest {
@Test
public void testLockInstance() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(true);
+ when(configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)).thenReturn(true);
+
CuratorFactory curatorFactory = new CuratorFactory(configuration) {
@Override
protected void initializeCuratorFramework() {
@@ -197,6 +206,9 @@ public class CuratorFactoryTest {
@Test
public void testClose() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(true);
+ when(configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)).thenReturn(true);
+
CuratorFactory curatorFactory = new CuratorFactory(configuration) {
@Override
protected void initializeCuratorFramework() {
@@ -215,6 +227,56 @@ public class CuratorFactoryTest {
verify(curatorFramework).close();
}
+ @Test
+ public void testConstructorDoesNotInitializeWhenHAKeyIsMissing() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(false);
+
+ CuratorFactory curatorFactory = new CuratorFactory(configuration) {
+ @Override
+ protected void initializeCuratorFramework() {
+ throw new AssertionError("initializeCuratorFramework() should not be called when HA key is missing");
+ }
+ };
+
+ assertNull(curatorFactory.clientInstance());
+ }
+
+ @Test
+ public void testConstructorDoesNotInitializeWhenHAIsDisabled() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(true);
+ when(configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)).thenReturn(false);
+
+ CuratorFactory curatorFactory = new CuratorFactory(configuration) {
+ @Override
+ protected void initializeCuratorFramework() {
+ throw new AssertionError("initializeCuratorFramework() should not be called when HA is disabled");
+ }
+ };
+
+ assertNull(curatorFactory.clientInstance());
+ }
+
+ @Test
+ public void testConstructorInitializesWhenHAIsEnabled() {
+ when(configuration.containsKey(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY)).thenReturn(true);
+ when(configuration.getBoolean(HAConfiguration.ATLAS_SERVER_HA_ENABLED_KEY, true)).thenReturn(true);
+
+ CuratorFactory curatorFactory = new CuratorFactory(configuration) {
+ @Override
+ protected void initializeCuratorFramework() {
+ try {
+ Field field = CuratorFactory.class.getDeclaredField("curatorFramework");
+ field.setAccessible(true);
+ field.set(this, curatorFramework);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ };
+
+ assertEquals(curatorFactory.clientInstance(), curatorFramework);
+ }
+
@Test
public void testGetIdForLoggingSaslScheme() throws Exception {
CuratorFactory curatorFactory = new CuratorFactory(configuration) {