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 2022/06/30 03:43:13 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2620] The long polling time is changed to be obtained from the c… (#3153)
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 703a97257 [SCB-2620] The long polling time is changed to be obtained from the c… (#3153)
703a97257 is described below
commit 703a972576b35154d9a9a46f087411fab86fd74a
Author: lbc97 <82...@users.noreply.github.com>
AuthorDate: Thu Jun 30 11:43:09 2022 +0800
[SCB-2620] The long polling time is changed to be obtained from the c… (#3153)
---
.../servicecomb/config/center/client/ConfigCenterManager.java | 2 +-
.../config/center/client/model/ConfigCenterConfiguration.java | 10 +++++-----
.../servicecomb/config/kie/client/KieConfigManager.java | 4 +---
.../servicecomb/config/kie/client/model/KieConfiguration.java | 11 +++++++++++
.../org/apache/servicecomb/config/ConfigCenterConfig.java | 2 +-
.../config/ConfigCenterConfigurationSourceImpl.java | 2 +-
.../java/org/apache/servicecomb/config/kie/KieConfig.java | 2 +-
.../servicecomb/config/kie/KieConfigurationSourceImpl.java | 1 +
8 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/ConfigCenterManager.java b/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/ConfigCenterManager.java
index 81c411cc5..9a89b92a6 100644
--- a/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/ConfigCenterManager.java
+++ b/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/ConfigCenterManager.java
@@ -80,7 +80,7 @@ public class ConfigCenterManager extends AbstractTask {
.createIncremental(configConverter.getCurrentData(), lastData);
eventBus.post(event);
}
- startTask(new BackOffSleepTask(configCenterConfiguration.getRefreshInterval(), new PollConfigurationTask(0)));
+ startTask(new BackOffSleepTask(configCenterConfiguration.getRefreshIntervalInMillis(), new PollConfigurationTask(0)));
} catch (Exception e) {
LOGGER.error("get configurations from ConfigCenter failed, and will try again.", e);
startTask(new BackOffSleepTask(failCount + 1, new PollConfigurationTask(failCount + 1)));
diff --git a/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/model/ConfigCenterConfiguration.java b/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/model/ConfigCenterConfiguration.java
index ba4dbc37a..0556d14fc 100644
--- a/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/model/ConfigCenterConfiguration.java
+++ b/clients/config-center-client/src/main/java/org/apache/servicecomb/config/center/client/model/ConfigCenterConfiguration.java
@@ -19,14 +19,14 @@ package org.apache.servicecomb.config.center.client.model;
public class ConfigCenterConfiguration {
- private long refreshInterval;
+ private long refreshIntervalInMillis = 15000;
- public long getRefreshInterval() {
- return refreshInterval;
+ public long getRefreshIntervalInMillis() {
+ return refreshIntervalInMillis;
}
- public ConfigCenterConfiguration setRefreshInterval(long refreshInterval) {
- this.refreshInterval = refreshInterval;
+ public ConfigCenterConfiguration setRefreshIntervalInMillis(long refreshIntervalInMillis) {
+ this.refreshIntervalInMillis = refreshIntervalInMillis;
return this;
}
}
diff --git a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java
index 435d9495c..7c1eaf923 100644
--- a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java
+++ b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java
@@ -41,8 +41,6 @@ public class KieConfigManager extends AbstractTask {
private static final long LONG_POLLING_INTERVAL = 1000;
- private static final long POLLING_INTERVAL = 15000;
-
private final KieConfigOperation configKieClient;
private final EventBus eventBus;
@@ -132,7 +130,7 @@ public class KieConfigManager extends AbstractTask {
if (KieConfigManager.this.kieConfiguration.isEnableLongPolling()) {
startTask(new BackOffSleepTask(LONG_POLLING_INTERVAL, new PollConfigurationTask(0, this.configurationsRequest)));
} else {
- startTask(new BackOffSleepTask(POLLING_INTERVAL, new PollConfigurationTask(0, this.configurationsRequest)));
+ startTask(new BackOffSleepTask(kieConfiguration.getRefreshIntervalInMillis(), new PollConfigurationTask(0, this.configurationsRequest)));
}
} catch (Exception e) {
LOGGER.error("get configurations from KieConfigCenter failed, and will try again.", e);
diff --git a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/KieConfiguration.java b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/KieConfiguration.java
index 8bf93c1cc..2a8bf4d9e 100644
--- a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/KieConfiguration.java
+++ b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/KieConfiguration.java
@@ -22,6 +22,8 @@ public class KieConfiguration {
private int pollingWaitInSeconds;
+ private int refreshIntervalInMillis = 15000;
+
private String project;
private String appName;
@@ -149,4 +151,13 @@ public class KieConfiguration {
this.firstPullRequired = firstPullRequired;
return this;
}
+
+ public int getRefreshIntervalInMillis() {
+ return refreshIntervalInMillis;
+ }
+
+ public KieConfiguration setRefreshIntervalInMillis(int refreshIntervallnMillis) {
+ this.refreshIntervalInMillis = refreshIntervallnMillis;
+ return this;
+ }
}
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfig.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfig.java
index 5352218da..837f6e0c7 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfig.java
@@ -47,7 +47,7 @@ public final class ConfigCenterConfig {
public static final String FILE_SOURCE = "servicecomb.config.client.fileSource";
- private static final int DEFAULT_REFRESH_INTERVAL = 30000;
+ private static final int DEFAULT_REFRESH_INTERVAL = 15000;
private static final int DEFAULT_FIRST_REFRESH_INTERVAL = 0;
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java
index d07ee7648..1af9136c8 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java
@@ -143,7 +143,7 @@ public class ConfigCenterConfigurationSourceImpl implements ConfigCenterConfigur
}
private ConfigCenterConfiguration createConfigCenterConfiguration(){
- return new ConfigCenterConfiguration().setRefreshInterval(ConfigCenterConfig.INSTANCE.getRefreshInterval());
+ return new ConfigCenterConfiguration().setRefreshIntervalInMillis(ConfigCenterConfig.INSTANCE.getRefreshInterval());
}
private HttpTransport createHttpTransport(AddressManager kieAddressManager, RequestConfig requestConfig,
diff --git a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfig.java b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfig.java
index 6409ff39d..31371cd8f 100644
--- a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfig.java
+++ b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfig.java
@@ -61,7 +61,7 @@ public class KieConfig {
public static final String FILE_SOURCE = "servicecomb.config.client.fileSource";
- private static final int DEFAULT_REFRESH_INTERVAL = 3000;
+ private static final int DEFAULT_REFRESH_INTERVAL = 15000;
private static final int DEFAULT_POLLING_WAIT_TIME = 10;
diff --git a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
index dc5cfa5e4..1c0de5419 100644
--- a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
+++ b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
@@ -120,6 +120,7 @@ public class KieConfigurationSourceImpl implements ConfigCenterConfigurationSour
.setEnvironment(KieConfig.INSTANCE.getEnvironment())
.setPollingWaitInSeconds(KieConfig.INSTANCE.getPollingWaitTime())
.setProject(KieConfig.INSTANCE.getDomainName())
+ .setRefreshIntervalInMillis(KieConfig.INSTANCE.getRefreshInterval())
.setServiceName(KieConfig.INSTANCE.getServiceName());
}