[servicecomb-java-chassis] 02/03: [SCB-1450] change servicecomb.service.registry.client.workerPoolSize to servicecomb.service.registry.client.instance for workerPoolSize can not indicate how many verticle instances had been deployed.

[ya...@apache.org]

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

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

commit 148fd2a10749ec2ebb7e19de5443fc6d0cc7e0b2
Author: Liu Huaizhou <li...@163.com>
AuthorDate: Tue Aug 20 14:53:14 2019 +0800

    [SCB-1450] change servicecomb.service.registry.client.workerPoolSize to servicecomb.service.registry.client.instance for workerPoolSize can not indicate how many verticle instances had been deployed.
---
 .../serviceregistry/config/ServiceRegistryConfig.java | 19 ++++++++++---------
 .../config/TestServiceRegistryConfig.java             |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index 98e126d..13a19e9 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -109,22 +109,23 @@ public final class ServiceRegistryConfig {
     return HttpVersion.valueOf(property.get());
   }
 
-  public int getWorkerPoolSize() {
-    String workerPoolSizeKey = "servicecomb.service.registry.client.workerPoolSize";
+  public int getInstances() {
+    String instances = "servicecomb.service.registry.client.instances ";
     DynamicIntProperty property =
-        DynamicPropertyFactory.getInstance()
-            .getIntProperty(workerPoolSizeKey, 1);
-    int workerPoolSize = property.get();
-    if (workerPoolSize <= 0) {
+            DynamicPropertyFactory.getInstance()
+                    .getIntProperty(instances, 1);
+    int deployInstances = property.get();
+    if (deployInstances <= 0) {
       int nAvailableProcessors = Runtime.getRuntime().availableProcessors();
       LOGGER.warn("The property `{}` must be positive integer, fallback to use number of available processors: {}",
-          workerPoolSizeKey,
-          nAvailableProcessors);
+              instances,
+              nAvailableProcessors);
       return nAvailableProcessors;
     }
-    return workerPoolSize;
+    return deployInstances;
   }
 
+
   public boolean isSsl() {
     getIpPort();
     return this.ssl;
diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
index 899cea8..061c2e9 100644
--- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
+++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
@@ -52,7 +52,7 @@ public class TestServiceRegistryConfig {
     Assert.assertNotEquals(null, oConfig.getHeartbeatInterval());
     Assert.assertEquals("HTTP_1_1", oConfig.getHttpVersion().name());
     Assert.assertEquals("rest", oConfig.getTransport());
-    Assert.assertEquals(1, oConfig.getWorkerPoolSize());
+    Assert.assertEquals(1, oConfig.getInstances());
     Assert.assertTrue(oConfig.isSsl());
     Assert.assertEquals(30000, oConfig.getRequestTimeout());
     Assert.assertEquals(3000, oConfig.getHeartBeatRequestTimeout());