fix:修复熔断指标上报数据不对问题

polarismesh · Apr 25, 2023 · de95730 · de95730
1 parent 89894f7
commit de95730
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...scovery/polaris-discovery-api/src/main/java/com/tencent/polaris/api/core/ProviderAPI.java b/...scovery/polaris-discovery-api/src/main/java/com/tencent/polaris/api/core/ProviderAPI.java
@@ -33,7 +33,7 @@
 public interface ProviderAPI extends AutoCloseable, Closeable {
 
     /**
-     * Register instance, minimum supported version of polaris-server is v1.10.0
+     * 注册服务实例，同时根据用户设置的 heartbeat ttl 维护心跳任务
      *
      * @param req register request
      * @return service register response

diff --git a/...iscovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/RegisterFlow.java b/...iscovery-client/src/main/java/com/tencent/polaris/discovery/client/flow/RegisterFlow.java
@@ -49,7 +49,7 @@ public class RegisterFlow {
 
     public RegisterFlow(SDKContext sdkContext) {
         this.sdkContext = sdkContext;
-        this.asyncRegisterExecutor = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("async-register"));
+        this.asyncRegisterExecutor = new ScheduledThreadPoolExecutor(4, new NamedThreadFactory("async-register"));
     }
 
     public InstanceRegisterResponse registerInstance(InstanceRegisterRequest request, RegisterFunction registerFunction,

diff --git a/.../src/main/java/com/tencent/polaris/plugins/circuitbreaker/composite/ResourceCounters.java b/.../src/main/java/com/tencent/polaris/plugins/circuitbreaker/composite/ResourceCounters.java
@@ -171,6 +171,7 @@ private void toOpen(CircuitBreakerStatus preStatus, String circuitBreaker) {
         circuitBreakerStatusReference.set(newStatus);
         CB_EVENT_LOG.info("previous status {}, current status {}, resource {}, rule {}", preStatus.getStatus(),
                 newStatus.getStatus(), resource, circuitBreaker);
+        reportCircuitStatus();
         int sleepWindow = currentActiveRule.getRecoverCondition().getSleepWindow();
         // add callback after timeout
         stateChangeExecutors.schedule(new Runnable() {
@@ -213,8 +214,8 @@ public void halfOpenToClose() {
                 for (TriggerCounter triggerCounter : counters) {
                     triggerCounter.resume();
                 }
+                reportCircuitStatus();
             }
-            reportCircuitStatus();
         }
     }
 
@@ -225,7 +226,6 @@ public void halfOpenToOpen() {
             if (circuitBreakerStatus.getStatus() == Status.HALF_OPEN) {
                 toOpen(circuitBreakerStatus, circuitBreakerStatus.getCircuitBreaker());
             }
-            reportCircuitStatus();
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>1.12.0</revision>
+        <revision>1.12.1</revision>
 
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>