only save to local file when version less than remote (#219)

* only save to local file when version less than remote

* fix ut

Author: lepdou

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/RemoteConfigFileRepo.java

@@ -34,6 +34,7 @@ public class RemoteConfigFileRepo extends AbstractConfigFileRepo {
 	private final ConfigFileConnector configFileConnector;
 	private final RetryPolicy retryPolicy;
 	private ConfigFilePersistentHandler configFilePersistHandler;
+	private final boolean fallbackToLocalCache;
 
 	static {
 		pullExecutorService = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Configuration-Pull"));
@@ -67,6 +68,7 @@ public RemoteConfigFileRepo(SDKContext sdkContext,
 			this.configFileConnector = (ConfigFileConnector) sdkContext.getExtensions().getPlugins()
 					.getPlugin(PluginTypes.CONFIG_FILE_CONNECTOR.getBaseType(), configFileConnectorType);
 		}
+
 		if (configFilePersistHandler != null) {
 			this.configFilePersistHandler = configFilePersistHandler;
 		}
@@ -78,6 +80,9 @@ public RemoteConfigFileRepo(SDKContext sdkContext,
 				LOGGER.warn("config file persist handler init fail:" + e.getMessage(), e);
 			}
 		}
+
+        this.fallbackToLocalCache = sdkContext.getConfig().getConfigFile().getServerConnector().getFallbackToLocalCache();
+
 		//同步从远程仓库拉取一次
 		pull();
 
@@ -141,8 +146,6 @@ protected void doPull() {
 
 				if (response.getCode() == ServerCodes.EXECUTE_SUCCESS) {
 					ConfigFile pulledConfigFile = response.getConfigFile();
-					// update local file cache
-					this.configFilePersistHandler.asyncSaveConfigFile(pulledConfigFile);
 
 					//本地配置文件落后，更新内存缓存
 					if (remoteConfigFile.get() == null ||
@@ -152,6 +155,9 @@ protected void doPull() {
 
 						//配置有更新，触发回调
 						fireChangeEvent(copiedConfigFile.getContent());
+
+                        // update local file cache
+                        this.configFilePersistHandler.asyncSaveConfigFile(pulledConfigFile);
 					}
 					return;
 				}
@@ -196,8 +202,7 @@ protected void doPull() {
 	}
 
 	private void fallbackIfNecessary(final int retryTimes, ConfigFile configFileReq) {
-		if (retryTimes >= PULL_CONFIG_RETRY_TIMES &&
-				sdkContext.getConfig().getConfigFile().getServerConnector().getFallbackToLocalCache()) {
+		if (retryTimes >= PULL_CONFIG_RETRY_TIMES && fallbackToLocalCache) {
 			ConfigFile configFileRes = configFilePersistHandler.loadPersistedConfigFile(configFileReq);
 			if (configFileRes != null) {
 				LOGGER.info("[Config] failed to pull config file from remote,fallback to local cache success.{}.", configFileRes);

polaris-configuration/polaris-configuration-client/src/test/java/com/tencent/polaris/configuration/client/internal/RemoteConfigFileRepoTest.java

@@ -10,7 +10,11 @@
 import com.tencent.polaris.configuration.api.core.ConfigFileMetadata;
 import com.tencent.polaris.configuration.client.ConfigFileTestUtils;
 
+import com.tencent.polaris.factory.config.ConfigurationImpl;
+import com.tencent.polaris.factory.config.configuration.ConfigFileConfigImpl;
+import com.tencent.polaris.factory.config.configuration.ConnectorConfigImpl;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -40,6 +44,17 @@ public class RemoteConfigFileRepoTest {
 	@Mock
     private ConfigFilePersistentHandler configFilePersistHandler;
 
+	@Before
+	public void before() {
+		ConfigurationImpl configuration = new ConfigurationImpl();
+		ConfigFileConfigImpl configFileConfig = new ConfigFileConfigImpl();
+		ConnectorConfigImpl connectorConfig = new ConnectorConfigImpl();
+		connectorConfig.setFallbackToLocalCache(true);
+		configFileConfig.setServerConnector(connectorConfig);
+		configuration.setConfigFile(configFileConfig);
+		when(sdkContext.getConfig()).thenReturn(configuration);
+	}
+
 	@Test
     public void testPullSuccess() {
         ConfigFileMetadata configFileMetadata = ConfigFileTestUtils.assembleDefaultConfigFileMeta();

pom.xml

@@ -64,7 +64,9 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>1.8.1-SNAPSHOT</revision>
+
+        <revision>1.9.0-SNAPSHOT</revision>
+
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>