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 2018/03/22 01:58:31 UTC
[incubator-servicecomb-java-chassis] 02/03: fix review comments and
add more test cases
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/incubator-servicecomb-java-chassis.git
commit 6936518fe4152c6fd588137977f338ea937beaf1
Author: liubao <ba...@huawei.com>
AuthorDate: Tue Mar 20 09:25:53 2018 +0800
fix review comments and add more test cases
---
.../org/apache/servicecomb/loadbalance/Configuration.java | 2 --
.../org/apache/servicecomb/loadbalance/TestLoadBalancer.java | 11 ++++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
index b3abd2a..3a2043b 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
@@ -103,7 +103,6 @@ public final class Configuration {
public int getSessionTimeoutInSeconds(String microservice) {
final int defaultValue = 30;
- // do not support MicroService level now
String p = getStringProperty("30",
PROP_ROOT + microservice + "." + SESSION_TIMEOUT_IN_SECONDS,
PROP_ROOT + SESSION_TIMEOUT_IN_SECONDS);
@@ -116,7 +115,6 @@ public final class Configuration {
public int getSuccessiveFailedTimes(String microservice) {
final int defaultValue = 5;
- // do not support MicroService level now
String p = getStringProperty("5",
PROP_ROOT + microservice + "." + SUCCESSIVE_FAILED_TIMES,
PROP_ROOT + SUCCESSIVE_FAILED_TIMES);
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java
index a62df19..1aa8775 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalancer.java
@@ -150,7 +150,7 @@ public class TestLoadBalancer {
}
@Test
- public void testLaodBalanceWithSessionSticknessRule() {
+ public void testLoadBalanceWithSessionSticknessRule() {
SessionStickinessRule rule = new SessionStickinessRule();
LoadBalancer lb = new LoadBalancer("lb1", rule, "service");
Assert.assertEquals(lb.getMicroServiceName(), "service");
@@ -175,5 +175,14 @@ public class TestLoadBalancer {
Utils.updateProperty("cse.loadbalance.service.SessionStickinessRule.sessionTimeoutInSeconds", 9);
s = lb.chooseServer("test");
Assert.assertEquals(server, s);
+
+ Utils.updateProperty("cse.loadbalance.service.SessionStickinessRule.successiveFailedTimes", 5);
+ lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
+ lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
+ lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
+ lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
+ lb.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(s);
+ s = lb.chooseServer("test");
+ Assert.assertEquals(server2, s);
}
}
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.