feat(proxy): update health check logic (#327)

netease-im · Oct 9, 2024 · 03875bc · 03875bc
1 parent 5b32abf
commit 03875bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...ava/com/netease/nim/camellia/redis/proxy/upstream/UpstreamRedisClientTemplateFactory.java b/...ava/com/netease/nim/camellia/redis/proxy/upstream/UpstreamRedisClientTemplateFactory.java
@@ -464,7 +464,7 @@ private void initCustom() {
     private UpstreamRedisClientTemplate initCustomInstance(long bid, String bgroup) {
         CamelliaTranspondProperties.CustomProperties custom = properties.getCustom();
         if (custom == null) return null;
-        logger.info("UpstreamRedisClientTemplate init, bid = {}, bgroup = {}", bid, bgroup);
+        logger.info("UpstreamRedisClientTemplate init custom instance, bid = {}, bgroup = {}", bid, bgroup);
         UpstreamRedisClientTemplate template = new UpstreamRedisClientTemplate(env, bid, bgroup, updater, custom.getReloadIntervalMillis());
         //更新的callback
         ResourceTableUpdateCallback updateCallback = template::update;
@@ -496,7 +496,7 @@ private UpstreamRedisClientTemplate initRemoteInstance(long bid, String bgroup)
         if (remote == null) return null;
         boolean monitorEnable = remote.isMonitorEnable();
         long checkIntervalMillis = remote.getCheckIntervalMillis();
-        logger.info("UpstreamRedisClientTemplate init, bid = {}, bgroup = {}", bid, bgroup);
+        logger.info("UpstreamRedisClientTemplate init remote instance, bid = {}, bgroup = {}", bid, bgroup);
         return new UpstreamRedisClientTemplate(env, apiService, bid, bgroup, monitorEnable, checkIntervalMillis);
     }
 

diff --git a/...in/java/com/netease/nim/camellia/redis/proxy/upstream/utils/ScheduledResourceChecker.java b/...in/java/com/netease/nim/camellia/redis/proxy/upstream/utils/ScheduledResourceChecker.java
@@ -44,19 +44,24 @@ private void schedule() {
                 String url = entry.getKey();
                 boolean valid = entry.getValue().isValid();
                 if (!valid) {
-                    logger.warn("IUpstreamClient with resource = {} not valid", url);
+                    logger.warn("redis resource = {} not valid", url);
                 }
                 validCache.put(url, valid);
                 Long lastCheckTime = lastCheckValidTime.get(url);
-                if (lastCheckTime != null && TimeCache.currentMillis - lastCheckTime > notActiveThresholdMs) {
-                    notActiveClients.add(url);
+                if (lastCheckTime == null) {
+                    lastCheckValidTime.put(url, TimeCache.currentMillis);
+                } else {
+                    if (TimeCache.currentMillis - lastCheckTime > notActiveThresholdMs) {
+                        notActiveClients.add(url);
+                    }
                 }
             }
             if (!notActiveClients.isEmpty()) {
                 for (String url : notActiveClients) {
                     clientCache.remove(url);
                     validCache.remove(url);
                     lastCheckValidTime.remove(url);
+                    logger.info("redis resource = {} not active, remove from check list", url);
                 }
             }
         } catch (Exception e) {
@@ -70,7 +75,7 @@ public void addResource(Resource resource) {
         IUpstreamClient client = factory.get(url);
         clientCache.put(url, client);
         boolean valid = client.isValid();
-        logger.info("addResource to ScheduledResourceChecker, resource = {}, valid = {}", url, valid);
+        logger.info("add redis resource = {} to check list, valid = {}", url, valid);
         validCache.put(url, valid);
         lastCheckValidTime.put(url, TimeCache.currentMillis);
     }