Skip to content

fix(consul): use concurrent watcher state maps #7145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dengliming wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −4
Open

fix(consul): use concurrent watcher state maps #7145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1303f6
fix(consul): use concurrent watcher state maps
dengliming Sep 20, 2026
46e1bc9
Merge branch 'master' into fix-6783-consul-watcher-concurrent-maps
yuluo-yx Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...c-data-consul/src/main/java/org/apache/shenyu/sync/data/consul/ConsulSyncDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
Expand All @@ -60,9 +60,9 @@ public class ConsulSyncDataService extends AbstractPathDataSyncService {
*/
private static final Logger LOG = LoggerFactory.getLogger(ConsulSyncDataService.class);

private final Map<String, Long> consulIndexes = new HashMap<>();
private final Map<String, Long> consulIndexes = new ConcurrentHashMap<>();

private final Map<String, List<ConsulData>> cacheConsulDataKeyMap = new HashMap<>();
private final Map<String, List<ConsulData>> cacheConsulDataKeyMap = new ConcurrentHashMap<>();

private final ScheduledThreadPoolExecutor executor;

Expand Down
14 changes: 13 additions & 1 deletion ...ta-consul/src/test/java/org/apache/shenyu/sync/data/consul/ConsulSyncDataServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
Expand Down Expand Up @@ -131,8 +132,19 @@ public void testWatchConfigKeyValues() throws NoSuchMethodException, IllegalAcce
final Field consulIndexes = ConsulSyncDataService.class.getDeclaredField("consulIndexes");
consulIndexes.setAccessible(true);
final Map<String, Long> consulIndexesSource = (Map<String, Long>) consulIndexes.get(consulSyncDataService);
consulIndexesSource.put("/null", null);
consulIndexesSource.remove(watchPathRoot);
when(response.getConsulIndex()).thenReturn(2L);
Assertions.assertDoesNotThrow(() -> watchConfigKeyValues.invoke(consulSyncDataService, watchPathRoot, updateHandler, deleteHandler));
}

@Test
public void testWatcherStateUsesConcurrentMaps() throws NoSuchFieldException, IllegalAccessException {
Field consulIndexesField = ConsulSyncDataService.class.getDeclaredField("consulIndexes");
consulIndexesField.setAccessible(true);
Field cacheDataField = ConsulSyncDataService.class.getDeclaredField("cacheConsulDataKeyMap");
cacheDataField.setAccessible(true);

Assertions.assertTrue(consulIndexesField.get(consulSyncDataService) instanceof ConcurrentHashMap);
Assertions.assertTrue(cacheDataField.get(consulSyncDataService) instanceof ConcurrentHashMap);
}
}
Loading