You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/07/30 03:18:16 UTC

[servicecomb-java-chassis] branch master updated: SCB-2308 the parameter of bulkhead supports to be 0 (#2486)

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new d62225f  SCB-2308 the parameter of bulkhead supports to be 0 (#2486)
d62225f is described below

commit d62225f222982d675dc81b4becc472e2e48c14c0
Author: zyl <72...@users.noreply.github.com>
AuthorDate: Fri Jul 30 11:18:08 2021 +0800

    SCB-2308 the parameter of bulkhead supports to be 0 (#2486)
    
    * #modify the parameters type of parameter circuitBreakerPolicy from int to float
    
    * # modify BulkheadPolicy parameter.
    
    * # add UT
---
 .../governance/policy/BulkheadPolicy.java          |  2 +-
 .../governance/GovernancePropertiesTest.java       | 31 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/governance/src/main/java/org/apache/servicecomb/governance/policy/BulkheadPolicy.java b/governance/src/main/java/org/apache/servicecomb/governance/policy/BulkheadPolicy.java
index 025242c..e542ae9 100644
--- a/governance/src/main/java/org/apache/servicecomb/governance/policy/BulkheadPolicy.java
+++ b/governance/src/main/java/org/apache/servicecomb/governance/policy/BulkheadPolicy.java
@@ -47,7 +47,7 @@ public class BulkheadPolicy extends AbstractPolicy {
 
   @Override
   public boolean isValid() {
-    if (maxConcurrentCalls <= 0) {
+    if (maxConcurrentCalls < 0) {
       return false;
     }
     if (Duration.parse(maxWaitDuration).toMillis() < 0) {
diff --git a/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java b/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
index 8512d48..97c1a43 100644
--- a/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
+++ b/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
@@ -203,6 +203,37 @@ public class GovernancePropertiesTest {
   }
 
   @Test
+  public void test_bulkhead_properties_bound() {
+    dynamicValues.put("servicecomb.bulkhead.test-bulkhead1", "rules:\n"
+        + "maxConcurrentCalls: 0\n"
+        + "maxWaitDuration: 2000");
+    dynamicValues.put("servicecomb.bulkhead.test-bulkhead2", "rules:\n"
+        + "maxConcurrentCalls: 1000\n"
+        + "maxWaitDuration: 0");
+    dynamicValues.put("servicecomb.bulkhead.test-bulkhead3", "rules:\n"
+        + "maxConcurrentCalls: 0\n"
+        + "maxWaitDuration: 2S");
+
+    EventManager.post(new ConfigurationChangedEvent(new HashSet<>(dynamicValues.keySet())));
+
+    Map<String, BulkheadPolicy> policies = bulkheadProperties.getParsedEntity();
+    Assert.assertEquals(4, policies.size());
+    BulkheadPolicy policy = policies.get("test-bulkhead1");
+    Assert.assertEquals(0, policy.getMaxConcurrentCalls());
+    Assert.assertEquals(2000, Duration.parse(policy.getMaxWaitDuration()).toMillis());
+
+    policy = policies.get("test-bulkhead2");
+    Assert.assertEquals(1000, policy.getMaxConcurrentCalls());
+    Assert.assertEquals(0, Duration.parse(policy.getMaxWaitDuration()).toMillis());
+    Assert.assertEquals("test-bulkhead2", policy.getName());
+
+    policy = policies.get("test-bulkhead3");
+    Assert.assertEquals(0, policy.getMaxConcurrentCalls());
+    Assert.assertEquals(2000, Duration.parse(policy.getMaxWaitDuration()).toMillis());
+    Assert.assertEquals("test-bulkhead3", policy.getName());
+  }
+
+  @Test
   public void test_bulkhead_properties_successfully_loaded() {
     Map<String, BulkheadPolicy> policies = bulkheadProperties.getParsedEntity();
     Assert.assertEquals(1, policies.size());