optimize roleinfo retry

apache · Oct 8, 2024 · 40ffcbd · 40ffcbd
1 parent 4274b72
commit 40ffcbd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeServerInfo.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/task/HugeServerInfo.java
@@ -114,6 +114,10 @@ public void increaseLoad(int delta) {
         this.updated = true;
     }
 
+    public long expireTime() {
+        return this.updateTime.getTime() + EXPIRED_INTERVAL;
+    }
+
     public Date updateTime() {
         return this.updateTime;
     }

diff --git a/...raph-server/hugegraph-core/src/main/java/org/apache/hugegraph/task/ServerInfoManager.java b/...raph-server/hugegraph-core/src/main/java/org/apache/hugegraph/task/ServerInfoManager.java
@@ -107,6 +107,19 @@ public synchronized void initServerInfo(GlobalMasterInfo nodeInfo) {
 
         Id serverId = nodeInfo.nodeId();
         HugeServerInfo existed = this.serverInfo(serverId);
+        if (existed != null && existed.alive()) {
+            final long now = DateUtil.now().getTime();
+            if (existed.expireTime() > now + 30 * 1000) {
+                LOG.info("the node time maybe skew very much: {}", existed);
+                throw new HugeException("The server with name '%s' maybe skew very much", serverId);
+            }
+            try {
+                Thread.sleep(existed.expireTime() - now);
+            } catch (InterruptedException e) {
+               throw new HugeException("Interrupted when waiting for server " +
+                                       "info expired", e);
+            }
+        }
         E.checkArgument(existed == null || !existed.alive(),
                         "The server with name '%s' already in cluster",
                         serverId);