This is an automated email from the ASF dual-hosted git repository.
yowuwuuuw pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 21e5d688eb refactor: rename GROUP_UPDATE_TIME to GROUP_UPDATE_TERM in
ClusterWatcherManager (#7789)
21e5d688eb is described below
commit 21e5d688eb3a4137fb0542715930cd4221fe59e7
Author: xiaoyu <[email protected]>
AuthorDate: Fri Nov 21 10:10:29 2025 +0800
refactor: rename GROUP_UPDATE_TIME to GROUP_UPDATE_TERM in
ClusterWatcherManager (#7789)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../seata/namingserver/manager/ClusterWatcherManager.java | 8 ++++----
.../apache/seata/namingserver/ClusterWatcherManagerTest.java | 10 +++++-----
.../seata/server/cluster/manager/ClusterWatcherManager.java | 6 +++---
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 3035531dcc..b54492d0e8 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -122,6 +122,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7617](https://github.com/seata/seata/pull/7617)] Refactor Alibaba Dubbo
and HSF
- [[#7688](https://github.com/seata/seata/pull/7688)] Reactor extensions module
- [[#7719](https://github.com/apache/incubator-seata/pull/7719)] Replace
synchronized with ReentrantLock in AbstractNettyRemotingClient to support
virtual threads
+- [[#7789](https://github.com/apache/incubator-seata/pull/7789)] rename
GROUP_UPDATE_TIME to GROUP_UPDATE_TERM in ClusterWatcherManager
### doc:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 31e126e0ca..6b568db625 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -119,6 +119,7 @@
- [[#7617](https://github.com/seata/seata/pull/7617)] 重构 Alibaba Dubbo 和 HSF 模块
- [[#7719](https://github.com/apache/incubator-seata/pull/7719)] 替换
AbstractNettyRemotingClient 中的 synchronized 为 ReentrantLock，以支持虚拟线程
- [[#7688](https://github.com/seata/seata/pull/7688)] 增加 extensions 模块
+- [[#7789](https://github.com/apache/incubator-seata/pull/7789)] 将
`GROUP_UPDATE_TIME` 重命名为 `GROUP_UPDATE_TERM`，更准确地反映其实际用途
### doc:
diff --git
a/namingserver/src/main/java/org/apache/seata/namingserver/manager/ClusterWatcherManager.java
b/namingserver/src/main/java/org/apache/seata/namingserver/manager/ClusterWatcherManager.java
index dd91608b33..d6cc387ff7 100644
---
a/namingserver/src/main/java/org/apache/seata/namingserver/manager/ClusterWatcherManager.java
+++
b/namingserver/src/main/java/org/apache/seata/namingserver/manager/ClusterWatcherManager.java
@@ -49,7 +49,7 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
private static final Map<String /* vgroup */, Queue<Watcher<?>>> WATCHERS
= new ConcurrentHashMap<>();
- private static final Map<String /* vgroup */, Long> GROUP_UPDATE_TIME =
new ConcurrentHashMap<>();
+ private static final Map<String /* vgroup */, Long> GROUP_UPDATE_TERM =
new ConcurrentHashMap<>();
private final ScheduledThreadPoolExecutor scheduledThreadPoolExecutor =
new ScheduledThreadPoolExecutor(1, new
CustomizableThreadFactory("long-polling"));
@@ -82,7 +82,7 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
@Async
public void onChangeEvent(ClusterChangeEvent event) {
if (event.getTerm() > 0 || event.getTerm() == -1) {
- GROUP_UPDATE_TIME.put(event.getGroup(), event.getTerm());
+ GROUP_UPDATE_TERM.put(event.getGroup(), event.getTerm());
// Notifications are made of changes in cluster information
Optional.ofNullable(WATCHERS.remove(event.getGroup()))
@@ -109,7 +109,7 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
public void registryWatcher(Watcher<?> watcher) {
String group = watcher.getGroup();
- Long term = GROUP_UPDATE_TIME.get(group);
+ Long term = GROUP_UPDATE_TERM.get(group);
if (term == null || watcher.getTerm() >= term) {
WATCHERS.computeIfAbsent(group, value -> new
ConcurrentLinkedQueue<>())
.add(watcher);
@@ -132,6 +132,6 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
}
public long getTermByvGroup(String vGroup) {
- return GROUP_UPDATE_TIME.getOrDefault(vGroup, 0L);
+ return GROUP_UPDATE_TERM.getOrDefault(vGroup, 0L);
}
}
diff --git
a/namingserver/src/test/java/org/apache/seata/namingserver/ClusterWatcherManagerTest.java
b/namingserver/src/test/java/org/apache/seata/namingserver/ClusterWatcherManagerTest.java
index 8b41c068bf..c9eba52d84 100644
---
a/namingserver/src/test/java/org/apache/seata/namingserver/ClusterWatcherManagerTest.java
+++
b/namingserver/src/test/java/org/apache/seata/namingserver/ClusterWatcherManagerTest.java
@@ -71,7 +71,7 @@ public class ClusterWatcherManagerTest {
Map<String, Queue<Watcher<?>>> watchers =
(Map<String, Queue<Watcher<?>>>)
ReflectionTestUtils.getField(clusterWatcherManager, "WATCHERS");
Map<String, Long> groupUpdateTime =
- (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TIME");
+ (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TERM");
watchers.clear();
groupUpdateTime.clear();
@@ -105,7 +105,7 @@ public class ClusterWatcherManagerTest {
@Test
void testRegistryWatcherOldTerm() {
Map<String, Long> groupUpdateTime =
- (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TIME");
+ (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TERM");
groupUpdateTime.put(TEST_GROUP, TEST_TERM + 10);
Watcher<AsyncContext> watcher =
@@ -131,7 +131,7 @@ public class ClusterWatcherManagerTest {
Map<String, Queue<Watcher<?>>> watchers =
(Map<String, Queue<Watcher<?>>>)
ReflectionTestUtils.getField(clusterWatcherManager, "WATCHERS");
Map<String, Long> updateTime =
- (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TIME");
+ (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TERM");
assertNotNull(watchers);
assertNotNull(updateTime);
@@ -197,7 +197,7 @@ public class ClusterWatcherManagerTest {
@Test
void testGetTermByvGroup() {
Map<String, Long> groupUpdateTime =
- (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TIME");
+ (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TERM");
assertNotNull(groupUpdateTime);
@@ -250,7 +250,7 @@ public class ClusterWatcherManagerTest {
clusterWatcherManager.onChangeEvent(minus1TermEvent);
Map<String, Long> updateTime =
- (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TIME");
+ (Map<String, Long>)
ReflectionTestUtils.getField(clusterWatcherManager, "GROUP_UPDATE_TERM");
assertEquals(-1L, updateTime.get(TEST_GROUP));
Mockito.verify(response).setStatus(HttpServletResponse.SC_OK);
Mockito.verify(asyncContext).complete();
diff --git
a/server/src/main/java/org/apache/seata/server/cluster/manager/ClusterWatcherManager.java
b/server/src/main/java/org/apache/seata/server/cluster/manager/ClusterWatcherManager.java
index 81b75ec716..632da039c1 100644
---
a/server/src/main/java/org/apache/seata/server/cluster/manager/ClusterWatcherManager.java
+++
b/server/src/main/java/org/apache/seata/server/cluster/manager/ClusterWatcherManager.java
@@ -51,7 +51,7 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
private static final Map<String, Queue<Watcher<HttpContext>>> WATCHERS =
new ConcurrentHashMap<>();
- private static final Map<String, Long> GROUP_UPDATE_TIME = new
ConcurrentHashMap<>();
+ private static final Map<String, Long> GROUP_UPDATE_TERM = new
ConcurrentHashMap<>();
private final ScheduledThreadPoolExecutor scheduledThreadPoolExecutor =
new ScheduledThreadPoolExecutor(1, new
NamedThreadFactory("long-polling", 1));
@@ -85,7 +85,7 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
@Async
public void onChangeEvent(ClusterChangeEvent event) {
if (event.getTerm() > 0) {
- GROUP_UPDATE_TIME.put(event.getGroup(), event.getTerm());
+ GROUP_UPDATE_TERM.put(event.getGroup(), event.getTerm());
// Notifications are made of changes in cluster information
Optional.ofNullable(WATCHERS.remove(event.getGroup()))
.ifPresent(watchers ->
watchers.parallelStream().forEach(this::notifyWatcher));
@@ -128,7 +128,7 @@ public class ClusterWatcherManager implements
ClusterChangeListener {
public void registryWatcher(Watcher<HttpContext> watcher) {
String group = watcher.getGroup();
- Long term = GROUP_UPDATE_TIME.get(group);
+ Long term = GROUP_UPDATE_TERM.get(group);
if (term == null || watcher.getTerm() >= term) {
WATCHERS.computeIfAbsent(group, value -> new
ConcurrentLinkedQueue<>())
.add(watcher);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
