add beacon host config hot update

ctripcorp · Sep 25, 2024 · 7b5244a · 7b5244a
1 parent 104bcad
commit 7b5244a
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 9 deletions.
diff --git a/core/src/main/java/com/ctrip/xpipe/api/migration/auto/MonitorService.java b/core/src/main/java/com/ctrip/xpipe/api/migration/auto/MonitorService.java
@@ -21,6 +21,8 @@ public interface MonitorService {
 
     void setWeight(int weight);
 
+    void updateHost(String host);
+
     Set<String> fetchAllClusters(String system);
 
     void registerCluster(String system, String clusterName, Set<MonitorGroupMeta> groups);

diff --git a/core/src/main/java/com/ctrip/xpipe/migration/auto/DefaultMonitorService.java b/core/src/main/java/com/ctrip/xpipe/migration/auto/DefaultMonitorService.java
@@ -42,6 +42,11 @@ public void setWeight(int weight) {
         this.weight = weight;
     }
 
+    @Override
+    public void updateHost(String host) {
+        // do nothing
+    }
+
     @Override
     public Set<String> fetchAllClusters(String system) {
         return Collections.emptySet();

diff --git a/.../main/java/com/ctrip/xpipe/redis/console/migration/auto/DefaultMonitorClusterManager.java b/.../main/java/com/ctrip/xpipe/redis/console/migration/auto/DefaultMonitorClusterManager.java
@@ -202,4 +202,9 @@ public void startSyncRingTaskNow() {
         this.executor.schedule(new ClustersRingSyncTask(), 5, TimeUnit.MILLISECONDS);
     }
 
+    @VisibleForTesting
+    public SortedMap<Integer, MonitorService> getRing() {
+        return ring;
+    }
+
 }
diff --git a/...ole/src/main/java/com/ctrip/xpipe/redis/console/migration/auto/DefaultMonitorManager.java b/...ole/src/main/java/com/ctrip/xpipe/redis/console/migration/auto/DefaultMonitorManager.java
@@ -118,6 +118,7 @@ private void init() {
                             monitorClusterManager.removeService(service);
                         } else if (!newClusterRoute.equals(oldClusterRoute)) {
                             monitorClusterManager.updateServiceWeight(service, newClusterRoute.getWeight());
+                            nameServiceMap.get(name).updateHost(newClusterRoute.getHost());
                         }
                     });
                     newHostRouteMap.forEach((name, newClusterRoute) -> {

diff --git a/.../src/test/java/com/ctrip/xpipe/redis/console/beacon/DefaultMonitorClusterManagerTest.java b/.../src/test/java/com/ctrip/xpipe/redis/console/beacon/DefaultMonitorClusterManagerTest.java
@@ -15,13 +15,7 @@
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultMonitorClusterManagerTest {
@@ -135,4 +129,25 @@ public void testUpdateServiceWeight() throws Exception {
 
     }
 
+    @Test
+    public void testUpdateServiceHost() throws Exception {
+        DefaultMonitorClusterManager monitorClusterManager1 = new DefaultMonitorClusterManager(metaCache, 10,
+                new ArrayList<>(), 1L);
+        monitorClusterManager1.addService(monitorService1);
+        monitorClusterManager1.addService(monitorService2);
+
+        DefaultMonitorClusterManager monitorClusterManager2 = new DefaultMonitorClusterManager(metaCache, 10,
+                new ArrayList<>(), 1L);
+        monitorClusterManager2.addService(monitorService1);
+        monitorClusterManager2.addService(monitorService2);
+        monitorService1.updateHost("127.0.0.1");
+        for (String cluster : clusters) {
+            Assert.assertEquals(monitorClusterManager1.getService(cluster), monitorClusterManager2.getService(cluster));
+        }
+        SortedMap<Integer, MonitorService> ring1 = monitorClusterManager1.getRing();
+        SortedMap<Integer, MonitorService> ring2 = monitorClusterManager2.getRing();
+        Assert.assertEquals(ring1, ring2);
+        Assert.assertEquals(ring1.hashCode(), ring2.hashCode());
+    }
+
 }
diff --git a/services/ctrip-service/src/main/java/com/ctrip/xpipe/service/beacon/BeaconService.java b/services/ctrip-service/src/main/java/com/ctrip/xpipe/service/beacon/BeaconService.java
@@ -26,8 +26,8 @@ public class BeaconService implements MonitorService {
     protected static final String PATH_GET_CLUSTERS = "/api/v1/monitor/{system}/clusters";
     protected static final String PATH_CLUSTER = "/api/v1/monitor/{system}/cluster/{cluster}";
 
-    private final String getAllClustersPath;
-    private final String clusterPath;
+    private String getAllClustersPath;
+    private String clusterPath;
 
     private String name;
     private String host;
@@ -66,6 +66,13 @@ public void setWeight(int weight) {
         this.weight = weight;
     }
 
+    @Override
+    public void updateHost(String host) {
+        this.host = host;
+        getAllClustersPath = host + PATH_GET_CLUSTERS;
+        clusterPath = host + PATH_CLUSTER;
+    }
+
     @Override
     public Set<String> fetchAllClusters(String system) {
         ResponseEntity<BeaconResp<Set<String>>> responseEntity = restTemplate.exchange(getAllClustersPath, HttpMethod.GET, null, clustersRespTypeDef, system);

diff --git a/services/ctrip-service/src/test/java/com/ctrip/xpipe/service/beacon/BeaconServiceTest.java b/services/ctrip-service/src/test/java/com/ctrip/xpipe/service/beacon/BeaconServiceTest.java
@@ -100,6 +100,22 @@ public void testUnregisterCluster() throws Exception {
         Assert.assertEquals("DELETE", request.getMethod());
     }
 
+    @Test
+    public void testUpdateBeaconHost() throws Exception {
+        MockWebServer mockWebServer = new MockWebServer();
+        mockWebServer.start(InetAddress.getByName("127.0.0.2"), randomPort());
+        beaconService.updateHost("http://127.0.0.2:" + mockWebServer.getPort());
+        mockWebServer.enqueue(new MockResponse().setBody("{\n" +
+                        "    \"code\": 0,\n" +
+                        "    \"msg\": \"success\"" +
+                        "}")
+                .setHeader("Content-Type", "application/json"));
+        beaconService.unregisterCluster(system, "cluster1");
+
+        RecordedRequest request = mockWebServer.takeRequest();
+        Assert.assertEquals("127.0.0.2", request.getRequestUrl().host());
+    }
+
     @Test(expected = BeaconServiceException.class)
     public void testUnregisterClusterRespErr() {
         enqueueServerErr();