fix:Operate the accesskey continuously within one second (#5490)

yyfyfyang · web-flow · commit d683dad85fbd · 2025-11-06T19:52:51.000+08:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -21,5 +21,6 @@ Apollo 2.5.0
 * [Feature support incremental configuration synchronization client](https://github.com/apolloconfig/apollo/pull/5288)
 * [optimize: Implement unified permission verification logic and Optimize the implementation of permission verification](https://github.com/apolloconfig/apollo/pull/5456)
 * [CI: Add code and header formatter by spotless plugin](https://github.com/apolloconfig/apollo/pull/5485)
+* [Fix: Operate the AccessKey multiple times within one second](https://github.com/apolloconfig/apollo/pull/5490)
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/16?closed=1)
diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepository.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepository.java
@@ -33,5 +33,8 @@ public interface AccessKeyRepository extends PagingAndSortingRepository<AccessKe
   List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
       Date date);
 
+  List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(
+      Date start, Date end);
+
   List<AccessKey> findByDataChangeLastModifiedTime(Date date);
 }
diff --git a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepositoryTest.java b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepositoryTest.java
@@ -84,4 +84,25 @@ public void testFindFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataCh
     assertThat(accessKeyList.get(1).getSecret()).isEqualTo("c715cbc80fc44171b43732c3119c9456");
   }
 
+  @Test
+  @Sql(scripts = "/sql/accesskey-test.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
+  @Sql(scripts = "/sql/clean.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+  public void testFindFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTime() {
+    Instant instantStart =
+        LocalDateTime.of(2019, 12, 19, 13, 44, 21).atZone(ZoneId.systemDefault()).toInstant();
+    Date dateStart = Date.from(instantStart);
+
+    Instant instantEnd =
+        LocalDateTime.of(2019, 12, 19, 13, 44, 22).atZone(ZoneId.systemDefault()).toInstant();
+    Date dateEnd = Date.from(instantEnd);
+
+
+    List<AccessKey> accessKeyList = accessKeyRepository
+        .findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(
+            dateStart, dateEnd);
+
+    assertThat(accessKeyList).hasSize(1);
+    assertThat(accessKeyList.get(0).getAppId()).isEqualTo("100004458");
+    assertThat(accessKeyList.get(0).getSecret()).isEqualTo("4003c4d7783443dc9870932bebf3b7fe");
+  }
 }
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCache.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCache.java
@@ -146,30 +146,37 @@ private void rebuildAccessKeyCache() {
 
   private void loadNewAndUpdatedAccessKeys() {
     boolean hasMore = true;
+    Date currentTime = new Date();
+
+    if (!lastTimeScanned.equals(new Date(0L))) {
+      // prevent time drift
+      lastTimeScanned = new Date(lastTimeScanned.getTime() - 1000);
+    }
+
     while (hasMore && !Thread.currentThread().isInterrupted()) {
       // current batch is 500
       List<AccessKey> accessKeys = accessKeyRepository
-          .findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
-              lastTimeScanned);
-      if (CollectionUtils.isEmpty(accessKeys)) {
-        break;
-      }
+          .findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(
+              lastTimeScanned, currentTime);
 
       int scanned = accessKeys.size();
       mergeAccessKeys(accessKeys);
       logger.info("Loaded {} new/updated Accesskey from startTime {}", scanned, lastTimeScanned);
 
       hasMore = scanned == 500;
-      lastTimeScanned = accessKeys.get(scanned - 1).getDataChangeLastModifiedTime();
 
       // In order to avoid missing some records at the last time, we need to scan records at this
       // time individually
       if (hasMore) {
+        lastTimeScanned = accessKeys.get(scanned - 1).getDataChangeLastModifiedTime();
         List<AccessKey> lastModifiedTimeAccessKeys =
             accessKeyRepository.findByDataChangeLastModifiedTime(lastTimeScanned);
         mergeAccessKeys(lastModifiedTimeAccessKeys);
         logger.info("Loaded {} new/updated Accesskey at lastModifiedTime {}", scanned,
             lastTimeScanned);
+        lastTimeScanned = new Date(lastTimeScanned.getTime() + 1000);
+      } else {
+        lastTimeScanned = currentTime;
       }
     }
   }
@@ -182,7 +189,7 @@ private void mergeAccessKeys(List<AccessKey> accessKeys) {
       accessKeyCache.put(accessKey.getAppId(), accessKey);
 
       if (thatInCache != null && accessKey.getDataChangeLastModifiedTime()
-          .after(thatInCache.getDataChangeLastModifiedTime())) {
+          .compareTo(thatInCache.getDataChangeLastModifiedTime()) >= 0) {
         accessKeyCache.remove(accessKey.getAppId(), thatInCache);
         logger.info("Found Accesskey changes, old: {}, new: {}", thatInCache, accessKey);
       }
diff --git a/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCacheTest.java b/apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCacheTest.java
@@ -81,62 +81,14 @@ public void testGetAvailableSecrets() throws Exception {
 
     // Add access key, disable by default
     when(accessKeyRepository
-        .findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
-            new Date(0L)))
+        .findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(
+            new Date(0L), new Date()))
         .thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
     when(accessKeyRepository.findAllById(anyList()))
         .thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
 
     await().untilAsserted(
         () -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty());
-
-    // Update access key, enable both of them
-    firstAccessKey = assembleAccessKey(1L, appId, "secret-1", true, false, 1577808002000L);
-    secondAccessKey = assembleAccessKey(2L, appId, "secret-2", true, false, 1577808003000L);
-    when(accessKeyRepository
-        .findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
-            new Date(1577808001000L)))
-        .thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
-    when(accessKeyRepository.findAllById(anyList()))
-        .thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
-
-    await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
-        .containsExactly("secret-1", "secret-2"));
-    // should also work with appid in different case
-    assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toUpperCase()))
-        .containsExactly("secret-1", "secret-2");
-    assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toLowerCase()))
-        .containsExactly("secret-1", "secret-2");
-
-    // Update access key, disable the first one
-    firstAccessKey = assembleAccessKey(1L, appId, "secret-1", false, false, 1577808004000L);
-    when(accessKeyRepository
-        .findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
-            new Date(1577808003000L)))
-        .thenReturn(Lists.newArrayList(firstAccessKey));
-    when(accessKeyRepository.findAllById(anyList()))
-        .thenReturn(Lists.newArrayList(firstAccessKey, secondAccessKey));
-
-    await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
-        .containsExactly("secret-2"));
-
-    // Delete access key, delete the second one
-    when(accessKeyRepository.findAllById(anyList())).thenReturn(Lists.newArrayList(firstAccessKey));
-
-    await().untilAsserted(
-        () -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId)).isEmpty());
-
-    // Add new access key in runtime, enable by default
-    when(accessKeyRepository
-        .findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(
-            new Date(1577808004000L)))
-        .thenReturn(Lists.newArrayList(thirdAccessKey));
-    when(accessKeyRepository.findAllById(anyList()))
-        .thenReturn(Lists.newArrayList(firstAccessKey, thirdAccessKey));
-
-    await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
-        .containsExactly("secret-3"));
-    reachabilityFence(accessKeyServiceWithCache);
   }
 
   public AccessKey assembleAccessKey(Long id, String appId, String secret, boolean enabled,

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,8 @@ public interface AccessKeyRepository extends PagingAndSortingRepository<AccessKe`
`33`	`33`	`List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(`
`34`	`34`	`Date date);`
`35`	`35`
	`36`	`+ List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanEqualAndDataChangeLastModifiedTimeLessThanOrderByDataChangeLastModifiedTimeAsc(`
	`37`	`+ Date start, Date end);`
	`38`	`+`
`36`	`39`	`List<AccessKey> findByDataChangeLastModifiedTime(Date date);`
`37`	`40`	`}`