Merge pull request #33 from jitendradhawan/hierarchical_env_selection…

…_fix Child environment discovery bug fix in hierarchical env shard selector
appform-io · Apr 1, 2024 · 8727e11 · 8727e11
2 parents 5c9f1c1 + 86b4890
commit 8727e11
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.0-RC16]
+- Fixed hierarchical environment aware shard selector  : If a service  is deployed with environment :  env.x.y.z then it should be able to discover other services present in environment -  [env , env.x , env.x.y, env.x.y.z ]
+
 ## [1.0-RC15]
 - Moved discovery bundle from https://github.com/appform-io/dropwizard-service-discovery.
 - Updated to dropwizard version 2.1.10 : BOM update.

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.appform.ranger</groupId>
     <artifactId>ranger</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-RC15</version>
+    <version>1.0-RC16</version>
     <name>Ranger</name>
     <url>https://github.com/appform-io/ranger</url>
     <description>Service Discovery for Java</description>

diff --git a/ranger-client/pom.xml b/ranger-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-core/pom.xml b/ranger-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-discovery-bundle/pom.xml b/ranger-discovery-bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../appform/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelector.java b/.../appform/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelector.java
@@ -109,7 +109,7 @@ public IterableEnvironment next() {
                 }
                 log.debug("Effective environment for discovery is {}", remainingEnvironment);
                 val shardInfo = new IterableEnvironment(remainingEnvironment, separator);
-                val sepIndex = remainingEnvironment.indexOf(this.separator);
+                val sepIndex = remainingEnvironment.lastIndexOf(this.separator);
                 remainingEnvironment = sepIndex < 0
                                        ? ""
                                        : remainingEnvironment.substring(0, sepIndex);

diff --git a/...form/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelectorTest.java b/...form/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelectorTest.java
@@ -18,6 +18,7 @@
 package io.appform.ranger.discovery.bundle.selectors;
 
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
 import io.appform.ranger.common.server.ShardInfo;
 import io.appform.ranger.core.finder.serviceregistry.MapBasedServiceRegistry;
 import io.appform.ranger.core.healthcheck.HealthcheckStatus;
@@ -30,6 +31,7 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
+import java.util.List;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -148,4 +150,64 @@ void testNoNodeAvailableForChildEnvButAvailableForParentEnv() {
         assertEquals("host2", nodes.get(0).getHost());
         assertEquals(9999, nodes.get(0).getPort());
     }
+
+    @Test
+    void testChildNodesAvailableForParentEnv() {
+        val serviceName = UUID.randomUUID().toString();
+        val service = Mockito.mock(Service.class);
+        doReturn(serviceName).when(service).getServiceName();
+        doReturn(service).when(serviceRegistry).getService();
+
+        // service in env: x.y.z should be able to discover service in env: x
+        ListMultimap<ShardInfo, ServiceNode<ShardInfo>> serviceNodes = ArrayListMultimap.create();
+        serviceNodes.put(
+                ShardInfo.builder().environment("x").build(),
+                new ServiceNode<>("host1",
+                        8888,
+                        ShardInfo.builder().environment("x").build(),
+                        HealthcheckStatus.healthy,
+                        System.currentTimeMillis(),
+                        "http"));
+        doReturn(serviceNodes).when(serviceRegistry).nodes();
+
+        List<ServiceNode<ShardInfo>> nodes = selector("x.y.z").nodes(null, serviceRegistry);
+        assertEquals(1, nodes.size());
+        assertEquals("host1", nodes.get(0).getHost());
+        assertEquals(8888, nodes.get(0).getPort());
+
+        // service in env: x.y.z should be able to discover service in env: x.y
+        serviceNodes = ArrayListMultimap.create();
+        serviceNodes.put(
+                ShardInfo.builder().environment("x.y").build(),
+                new ServiceNode<>("host2",
+                        9999,
+                        ShardInfo.builder().environment("x.y").build(),
+                        HealthcheckStatus.healthy,
+                        System.currentTimeMillis(),
+                        "http"));
+        doReturn(serviceNodes).when(serviceRegistry).nodes();
+
+        nodes = selector("x.y.z").nodes(null, serviceRegistry);
+        assertEquals(1, nodes.size());
+        assertEquals("host2", nodes.get(0).getHost());
+        assertEquals(9999, nodes.get(0).getPort());
+
+        // service in env: x.y.z should be able to discover service in env: x
+        serviceNodes = ArrayListMultimap.create();
+        serviceNodes.put(
+                ShardInfo.builder().environment("x").build(),
+                new ServiceNode<>("host3",
+                        9999,
+                        ShardInfo.builder().environment("x").build(),
+                        HealthcheckStatus.healthy,
+                        System.currentTimeMillis(),
+                        "http"));
+        doReturn(serviceNodes).when(serviceRegistry).nodes();
+
+        nodes = selector("x.y.z").nodes(null, serviceRegistry);
+        assertEquals(1, nodes.size());
+        assertEquals("host3", nodes.get(0).getHost());
+        assertEquals(9999, nodes.get(0).getPort());
+
+    }
 }
diff --git a/ranger-http-client/pom.xml b/ranger-http-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-http-model/pom.xml b/ranger-http-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-http-server-bundle/pom.xml b/ranger-http-server-bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-http-server/pom.xml b/ranger-http-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-http/pom.xml b/ranger-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-server-bundle/pom.xml b/ranger-server-bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-server-common/pom.xml b/ranger-server-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-zk-client/pom.xml b/ranger-zk-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-zk-server-bundle/pom.xml b/ranger-zk-server-bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-zk-server/pom.xml b/ranger-zk-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ranger-zookeeper/pom.xml b/ranger-zookeeper/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.0-RC15</version>
+        <version>1.0-RC16</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>