fix: #434 熔断规则被删除后，不再进行状态机的轮转 (#436)

Author: andrewshan

polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/pojo/HalfOpenStatus.java

@@ -43,10 +43,6 @@ public HalfOpenStatus(String circuitBreaker, long startTimeMs, int maxRequest) {
         this.calledResult = new ArrayList<>(maxRequest * 2);
     }
 
-    public int getMaxRequest() {
-        return maxRequest;
-    }
-
     public boolean report(boolean success) {
         synchronized (lock) {
             calledResult.add(success);

polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/src/main/java/com/tencent/polaris/plugins/circuitbreaker/composite/CircuitBreakerRuleContainer.java

@@ -100,7 +100,9 @@ public void run() {
                 } else {
                     ResourceCounters oldCounters = resourceResourceCounters.remove(resource);
                     if (null != oldCounters) {
+                        LOG.info("start to destroyed counters {} for resource {}", oldCounters.getCurrentActiveRule().getName(), resource);
                         // remove the old health check scheduler
+                        oldCounters.setDestroyed(true);
                         scheduleHealthCheck();
                     }
                 }

polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/src/main/java/com/tencent/polaris/plugins/circuitbreaker/composite/ResourceCounters.java

@@ -60,6 +60,7 @@
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.regex.Pattern;
@@ -87,6 +88,8 @@ public class ResourceCounters implements StatusChangeHandler {
 
     private Extensions extensions;
 
+    private final AtomicBoolean destroyed = new AtomicBoolean(false);
+
     public ResourceCounters(Resource resource, CircuitBreakerRule currentActiveRule,
             ScheduledExecutorService stateChangeExecutors, PolarisCircuitBreaker polarisCircuitBreaker) {
         this.currentActiveRule = currentActiveRule;
@@ -158,6 +161,10 @@ public CircuitBreakerRule getCurrentActiveRule() {
     @Override
     public void closeToOpen(String circuitBreaker) {
         synchronized (this) {
+            if (destroyed.get()) {
+                LOG.info("counters {} for resource {} is destroyed, closeToOpen skipped", currentActiveRule.getName(), resource);
+                return;
+            }
             CircuitBreakerStatus circuitBreakerStatus = circuitBreakerStatusReference.get();
             if (circuitBreakerStatus.getStatus() == Status.CLOSE) {
                 toOpen(circuitBreakerStatus, circuitBreaker);
@@ -185,6 +192,10 @@ public void run() {
     @Override
     public void openToHalfOpen() {
         synchronized (this) {
+            if (destroyed.get()) {
+                LOG.info("counters {} for resource {} is destroyed, openToHalfOpen skipped", currentActiveRule.getName(), resource);
+                return;
+            }
             CircuitBreakerStatus circuitBreakerStatus = circuitBreakerStatusReference.get();
             if (circuitBreakerStatus.getStatus() != Status.OPEN) {
                 return;
@@ -203,6 +214,10 @@ public void openToHalfOpen() {
     @Override
     public void halfOpenToClose() {
         synchronized (this) {
+            if (destroyed.get()) {
+                LOG.info("counters {} for resource {} is destroyed, halfOpenToClose skipped", currentActiveRule.getName(), resource);
+                return;
+            }
             CircuitBreakerStatus circuitBreakerStatus = circuitBreakerStatusReference.get();
             if (circuitBreakerStatus.getStatus() == Status.HALF_OPEN) {
                 CircuitBreakerStatus newStatus = new CircuitBreakerStatus(circuitBreakerStatus.getCircuitBreaker(),
@@ -222,6 +237,10 @@ public void halfOpenToClose() {
     @Override
     public void halfOpenToOpen() {
         synchronized (this) {
+            if (destroyed.get()) {
+                LOG.info("counters {} for resource {} is destroyed, halfOpenToOpen skipped", currentActiveRule.getName(), resource);
+                return;
+            }
             CircuitBreakerStatus circuitBreakerStatus = circuitBreakerStatusReference.get();
             if (circuitBreakerStatus.getStatus() == Status.HALF_OPEN) {
                 toOpen(circuitBreakerStatus, circuitBreakerStatus.getCircuitBreaker());
@@ -345,4 +364,8 @@ public void reportCircuitStatus() {
             }
         }
     }
+
+    public void setDestroyed(boolean value) {
+        destroyed.set(value);
+    }
 }

polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/src/test/java/com/tencent/polaris/plugins/circuitbraker/composite/trigger/ResourceCountersTest.java

@@ -142,4 +142,27 @@ public void testParseStatus() {
         Assert.assertEquals(RetStatus.RetSuccess, nextStatus);
     }
 
+    @Test
+    public void testDestroy() {
+        CircuitBreakerRule.Builder builder = CircuitBreakerRule.newBuilder();
+        builder.setName("test_cb_rule");
+        builder.setEnable(true);
+        builder.setLevel(Level.METHOD);
+        builder.addErrorConditions(ErrorCondition.newBuilder().setCondition(MatchString.newBuilder().setValue(
+                StringValue.newBuilder().setValue("500").build())).build());
+        builder.addTriggerCondition(
+                TriggerCondition.newBuilder().setTriggerType(TriggerType.CONSECUTIVE_ERROR).setErrorCount(5).build());
+        builder.setRecoverCondition(RecoverCondition.newBuilder().setConsecutiveSuccess(1).setSleepWindow(5).build());
+        Resource resource = new MethodResource(new ServiceKey("test", "TestSvc"), "foo");
+        ResourceCounters resourceCounters = new ResourceCounters(resource, builder.build(), null, null);
+        resourceCounters.setDestroyed(true);
+        resourceCounters.report(new ResourceStat(resource, 500, 1000));
+        resourceCounters.closeToOpen("cb_rule_status");
+        resourceCounters.openToHalfOpen();
+        resourceCounters.halfOpenToClose();
+        resourceCounters.halfOpenToOpen();
+        Assert.assertEquals(Status.CLOSE, resourceCounters.getCircuitBreakerStatus().getStatus());
+    }
+
+
 }