Merge pull request #505 from nobodyiam/config-service-optimize

Config service optimize
apolloconfig · Dec 28, 2016 · 3ddf3e6 · 3ddf3e6
2 parents 75bed9b + 967041c
commit 3ddf3e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 28 deletions.
diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
@@ -96,14 +96,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>github</id>
-			<properties>
-				<package.environment>github</package.environment>
-			</properties>
-			<dependencies>
-			</dependencies>
-		</profile>
-	</profiles>
 </project>
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
@@ -97,14 +97,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>github</id>
-			<properties>
-				<package.environment>github</package.environment>
-			</properties>
-			<dependencies>
-			</dependencies>
-		</profile>
-	</profiles>
 </project>
diff --git a/.../src/main/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtil.java b/.../src/main/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtil.java
@@ -36,6 +36,7 @@ public class InstanceConfigAuditUtil implements InitializingBean {
   private static final int INSTANCE_CONFIG_AUDIT_MAX_SIZE = 2000;
   private static final int INSTANCE_CACHE_MAX_SIZE = 10000;
   private static final int INSTANCE_CONFIG_CACHE_MAX_SIZE = 10000;
+  private static final long OFFER_TIME_LAST_MODIFIED_TIME_THRESHOLD_IN_MILLI = TimeUnit.MINUTES.toMillis(10);//10 minutes
   private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
   private final ExecutorService auditExecutorService;
   private final AtomicBoolean auditStopped;
@@ -93,6 +94,10 @@ void doAudit(InstanceConfigAuditModel auditModel) {
         instanceConfig.setConfigClusterName(auditModel.getConfigClusterName());
         instanceConfig.setReleaseKey(auditModel.getReleaseKey());
         instanceConfig.setReleaseDeliveryTime(auditModel.getOfferTime());
+      } else if (offerTimeAndLastModifiedTimeCloseEnough(auditModel.getOfferTime(),
+          instanceConfig.getDataChangeLastModifiedTime())) {
+        //when releaseKey is the same, optimize to reduce writes if the record was updated not long ago
+        return;
       }
       //we need to update no matter the release key is the same or not, to ensure the
       //last modified time is updated each day
@@ -117,6 +122,11 @@ void doAudit(InstanceConfigAuditModel auditModel) {
     }
   }
 
+  private boolean offerTimeAndLastModifiedTimeCloseEnough(Date offerTime, Date lastModifiedTime) {
+    return (offerTime.getTime() - lastModifiedTime.getTime()) <
+        OFFER_TIME_LAST_MODIFIED_TIME_THRESHOLD_IN_MILLI;
+  }
+
   private long prepareInstanceId(InstanceConfigAuditModel auditModel) {
     Instance instance = instanceService.findInstance(auditModel.getAppId(), auditModel
         .getClusterName(), auditModel.getDataCenter(), auditModel.getIp());

diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml
@@ -70,13 +70,5 @@
 				</dependency>
 			</dependencies>
 		</profile>
-        <profile>
-            <id>github</id>
-            <properties>
-                <package.environment>github</package.environment>
-            </properties>
-            <dependencies>
-            </dependencies>
-        </profile>
 	</profiles>
 </project>