dramatically improve the apollo client unit test performance

nobodyiam · nobodyiam · commit 95cf37c5753f · 2017-01-23T18:24:28.000+08:00
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java
@@ -131,7 +131,7 @@ private synchronized void updateConfigServices() {
       }
 
       try {
-        TimeUnit.SECONDS.sleep(1);
+        m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());
       } catch (InterruptedException ex) {
         //ignore
       }
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java
@@ -228,7 +228,7 @@ private ApolloConfig loadApolloConfig() {
       }
 
       try {
-        TimeUnit.SECONDS.sleep(1);
+        m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());
       } catch (InterruptedException ex) {
         //ignore
       }
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
@@ -29,6 +29,9 @@ public class ConfigUtil {
   private String cluster;
   private int loadConfigQPS = 2; //2 times per second
   private int longPollQPS = 2; //2 times per second
+  //for on error retry
+  private long onErrorRetryInterval = 1;//1 second
+  private TimeUnit onErrorRetryIntervalTimeUnit = TimeUnit.SECONDS;//1 second
   //for typed config cache of parser result, e.g. integer, double, long, etc.
   private long maxConfigCacheSize = 500;//500 cache key
   private long configCacheExpireTime = 1;//1 minute
@@ -212,6 +215,14 @@ public int getLongPollQPS() {
     return longPollQPS;
   }
 
+  public long getOnErrorRetryInterval() {
+    return onErrorRetryInterval;
+  }
+
+  public TimeUnit getOnErrorRetryIntervalTimeUnit() {
+    return onErrorRetryIntervalTimeUnit;
+  }
+
   public String getDefaultLocalCacheDir() {
     String cacheRoot = isOSWindows() ? "C:\\opt\\data\\%s" : "/opt/data/%s";
     return String.format(cacheRoot, getAppId());
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java
@@ -182,6 +182,16 @@ public int getLongPollQPS() {
     public String getDefaultLocalCacheDir() {
       return ClassLoaderUtil.getClassPath();
     }
+
+    @Override
+    public long getOnErrorRetryInterval() {
+      return 10;
+    }
+
+    @Override
+    public TimeUnit getOnErrorRetryIntervalTimeUnit() {
+      return TimeUnit.MILLISECONDS;
+    }
   }
 
   /**
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java
@@ -233,6 +233,16 @@ public int getLoadConfigQPS() {
     public int getLongPollQPS() {
       return 200;
     }
+
+    @Override
+    public long getOnErrorRetryInterval() {
+      return 10;
+    }
+
+    @Override
+    public TimeUnit getOnErrorRetryIntervalTimeUnit() {
+      return TimeUnit.MILLISECONDS;
+    }
   }
 
   public static class MockConfigServiceLocator extends ConfigServiceLocator {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private synchronized void updateConfigServices() {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`try {`
`134`		`- TimeUnit.SECONDS.sleep(1);`
	`134`	`+ m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());`
`135`	`135`	`} catch (InterruptedException ex) {`
`136`	`136`	`//ignore`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ private ApolloConfig loadApolloConfig() {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`try {`
`231`		`- TimeUnit.SECONDS.sleep(1);`
	`231`	`+ m_configUtil.getOnErrorRetryIntervalTimeUnit().sleep(m_configUtil.getOnErrorRetryInterval());`
`232`	`232`	`} catch (InterruptedException ex) {`
`233`	`233`	`//ignore`
`234`	`234`	`}`