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 2020/01/14 06:28:33 UTC
[servicecomb-java-chassis] 02/04: Fix typos
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
commit c89bd21ab2972fde83f60f5b02872b8a0700e94f
Author: AngLi2 <li...@qq.com>
AuthorDate: Sat Jan 11 11:46:38 2020 +0800
Fix typos
---
.../org/apache/servicecomb/loadbalance/Configuration.java | 4 ++--
.../loadbalance/ServiceCombLoadBalancerStats.java | 14 +++++++-------
.../loadbalance/TestServiceCombLoadBalancerStats.java | 2 +-
3 files changed, 10 insertions(+), 10 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 fd3190f..a67c700 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
@@ -31,9 +31,9 @@ public final class Configuration {
//// 2.1 configuration items
public static final String PROP_ROOT = "servicecomb.loadbalance.";
- public static final String RPOP_SERVER_EXPIRED_IN_SECONDS = "servicecomb.loadbalance.stats.serverExpiredInSeconds";
+ public static final String PROP_SERVER_EXPIRED_IN_SECONDS = "servicecomb.loadbalance.stats.serverExpiredInSeconds";
- public static final String RPOP_TIMER_INTERVAL_IN_MINIS = "servicecomb.loadbalance.stats.timerIntervalInMilis";
+ public static final String PROP_TIMER_INTERVAL_IN_MILLIS = "servicecomb.loadbalance.stats.timerIntervalInMilis";
public static final String PROP_RULE_STRATEGY_NAME = "strategy.name";
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java
index bdcd0dc..d7995da 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java
@@ -48,10 +48,10 @@ public class ServiceCombLoadBalancerStats {
private final Map<ServiceCombServer, ServiceCombServerStats> pingView = new ConcurrentHashMap<>();
private int serverExpireInSeconds = DynamicPropertyFactory.getInstance()
- .getIntProperty(Configuration.RPOP_SERVER_EXPIRED_IN_SECONDS, 300).get();
+ .getIntProperty(Configuration.PROP_SERVER_EXPIRED_IN_SECONDS, 300).get();
- private long timerIntervalInMilis = DynamicPropertyFactory.getInstance()
- .getLongProperty(Configuration.RPOP_TIMER_INTERVAL_IN_MINIS, 10000).get();
+ private long timerIntervalInMillis = DynamicPropertyFactory.getInstance()
+ .getLongProperty(Configuration.PROP_TIMER_INTERVAL_IN_MILLIS, 10000).get();
private LoadingCache<ServiceCombServer, ServiceCombServerStats> serverStatsCache;
@@ -124,8 +124,8 @@ public class ServiceCombLoadBalancerStats {
}
@VisibleForTesting
- void setTimerIntervalInMilis(int milis) {
- this.timerIntervalInMilis = milis;
+ void setTimerIntervalInMillis(int millis) {
+ this.timerIntervalInMillis = millis;
}
@VisibleForTesting
@@ -176,7 +176,7 @@ public class ServiceCombLoadBalancerStats {
allServers.entrySet().forEach(serviceCombServerServiceCombServerStatsEntry -> {
ServiceCombServer server = serviceCombServerServiceCombServerStatsEntry.getKey();
ServiceCombServerStats stats = serviceCombServerServiceCombServerStatsEntry.getValue();
- if ((System.currentTimeMillis() - stats.getLastVisitTime() > timerIntervalInMilis) && !ping
+ if ((System.currentTimeMillis() - stats.getLastVisitTime() > timerIntervalInMillis) && !ping
.ping(server.getInstance())) {
LOGGER.info("ping mark server {} failure.", server.getInstance().getInstanceId());
stats.markFailure();
@@ -187,7 +187,7 @@ public class ServiceCombLoadBalancerStats {
LOGGER.warn("LoadBalancerStatsTimer error.", e);
}
}
- }, timerIntervalInMilis, timerIntervalInMilis);
+ }, timerIntervalInMillis, timerIntervalInMillis);
}
}
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombLoadBalancerStats.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombLoadBalancerStats.java
index faa3d89..79fec89 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombLoadBalancerStats.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombLoadBalancerStats.java
@@ -74,7 +74,7 @@ public class TestServiceCombLoadBalancerStats {
ServiceCombLoadBalancerStats serviceCombLoadBalancerStats = new ServiceCombLoadBalancerStats();
serviceCombLoadBalancerStats.setServerExpireInSeconds(2);
- serviceCombLoadBalancerStats.setTimerIntervalInMilis(500);
+ serviceCombLoadBalancerStats.setTimerIntervalInMillis(500);
serviceCombLoadBalancerStats.init();
ServiceCombServer serviceCombServer = new ServiceCombServer(transport,