commit fa05355cf9c7a2f76543415eec94d7882201db09
author liubao <bismy@qq.com> Fri Jun 17 09:31:59 2022 +0800
committer liubao68 <bismy@qq.com> Sun Jun 19 16:43:13 2022 +0800
tree bf904a10f06a18718b71f6e342990f2d0d4ab19a
parent 5728e1821d70eff4d1e44f2d093f76220d3d2fb5

[SCB-2578]instance pull should avoid too many queued events

clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java

diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
index f0c2673..6b5578e 100644
--- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
+++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterDiscovery.java
@@ -45,6 +45,8 @@
 
   private static final String ALL_VERSION = "0+";
 
+  private static volatile boolean pullInstanceTaskOnceInProgress = false;
+
   public static class SubscriptionKey {
     final String appId;
 
@@ -144,7 +146,12 @@
 
   @Subscribe
   public void onPullInstanceEvent(PullInstanceEvent event) {
-    pullAllInstance();
+    // to avoid too many pulls queued.
+    if (pullInstanceTaskOnceInProgress) {
+      return;
+    }
+    pullInstanceTaskOnceInProgress = true;
+    startTask(new PullInstanceOnceTask());
   }
 
   private void pullInstance(SubscriptionKey k, SubscriptionValue v) {
@@ -205,6 +212,17 @@
     }
   }
 
+  class PullInstanceOnceTask implements Task {
+    @Override
+    public void execute() {
+      try {
+        pullAllInstance();
+      } finally {
+        pullInstanceTaskOnceInProgress = false;
+      }
+    }
+  }
+
   private synchronized void pullAllInstance() {
     instancesCache.forEach((k, v) -> {
       pullInstance(k, v);

governance/src/main/java/org/apache/servicecomb/governance/handler/InstanceIsolationHandler.java

diff --git a/governance/src/main/java/org/apache/servicecomb/governance/handler/InstanceIsolationHandler.java b/governance/src/main/java/org/apache/servicecomb/governance/handler/InstanceIsolationHandler.java
index 85afecd..8ab3333 100644
--- a/governance/src/main/java/org/apache/servicecomb/governance/handler/InstanceIsolationHandler.java
+++ b/governance/src/main/java/org/apache/servicecomb/governance/handler/InstanceIsolationHandler.java
@@ -34,7 +34,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 
 public class InstanceIsolationHandler extends AbstractGovernanceHandler<CircuitBreaker, CircuitBreakerPolicy> {
-  private static final Logger LOGGER = LoggerFactory.getLogger(CircuitBreakerHandler.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(InstanceIsolationHandler.class);
 
   private static final String DEFAULT_SERVICE_NAME = "default";