Merge pull request #928 from ctripcorp/bugfix/metaserver

remove wild keeper
ctripcorp · Jan 20, 2025 · e070256 · e070256
2 parents 2828a3f + dcb88bd
commit e070256
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/...ava/com/ctrip/xpipe/redis/meta/server/keeper/container/DefaultKeeperContainerService.java b/...ava/com/ctrip/xpipe/redis/meta/server/keeper/container/DefaultKeeperContainerService.java
@@ -52,10 +52,11 @@ public void addKeeper(KeeperTransMeta keeperTransMeta) {
     @Override
     public void removeKeeper(KeeperTransMeta keeperTransMeta) {
         try {
+            long clusterDbId = null == keeperTransMeta.getClusterDbId() ? 1:keeperTransMeta.getClusterDbId();
+            long shardDbId = null == keeperTransMeta.getShardDbId() ? 1:keeperTransMeta.getShardDbId();
             restTemplate.exchange("http://{ip}:{port}/keepers/clusters/{clusterId}/shards/{shardId}",
                     HttpMethod.DELETE, new HttpEntity<Object>(keeperTransMeta), Void.class,
-                    keeperContainerMeta.getIp(), keeperContainerMeta.getPort(), keeperTransMeta.getClusterDbId(),
-                    keeperTransMeta.getShardDbId());
+                    keeperContainerMeta.getIp(), keeperContainerMeta.getPort(), clusterDbId, shardDbId);
         } catch (HttpStatusCodeException ex) {
             throw KeeperContainerErrorParser.parseErrorFromHttpException(ex);
         }

diff --git a/...n/java/com/ctrip/xpipe/redis/meta/server/keeper/manager/DefaultKeeperStateController.java b/...n/java/com/ctrip/xpipe/redis/meta/server/keeper/manager/DefaultKeeperStateController.java
@@ -34,8 +34,8 @@ public class DefaultKeeperStateController extends AbstractLifecycle implements K
 
 	private Logger logger = LoggerFactory.getLogger(getClass());
 
-	private int addKeeperSuccessTimeoutMilli =    180000;
-	private int removeKeeperSuccessTimeoutMilli = 60000;
+	private int addKeeperSuccessTimeoutMilli =    10000;
+	private int removeKeeperSuccessTimeoutMilli = 10000;
 
 	@Autowired
 	private KeeperContainerServiceFactory keeperContainerServiceFactory;

diff --git a/...com/ctrip/xpipe/redis/meta/server/keeper/container/DefaultKeeperContainerServiceTest.java b/...com/ctrip/xpipe/redis/meta/server/keeper/container/DefaultKeeperContainerServiceTest.java
@@ -53,6 +53,17 @@ public void testRemoveKeeper() throws Exception {
         Assert.assertEquals(meta, Codec.DEFAULT.decode(request.getBody().readByteArray(), KeeperTransMeta.class));
     }
 
+    @Test
+    public void testRemoveWithReplId() throws Exception {
+        this.webServer.enqueue(new MockResponse());
+        KeeperTransMeta meta = new KeeperTransMeta(1L, new KeeperMeta());
+        this.service.removeKeeper(meta);
+        RecordedRequest request = this.webServer.takeRequest();
+        Assert.assertEquals(HttpMethod.DELETE.toString(), request.getMethod());
+        Assert.assertEquals("/keepers/clusters/1/shards/1", request.getPath());
+        Assert.assertEquals(meta, Codec.DEFAULT.decode(request.getBody().readByteArray(), KeeperTransMeta.class));
+    }
+
     private KeeperTransMeta mockKeeperMeta() {
         return new KeeperTransMeta(1L, 1L, new KeeperMeta());
     }