This is an automated email from the ASF dual-hosted git repository.
jianbin 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 5b31862a13 optimize: support instance registration to the registry
center (#7089)
5b31862a13 is described below
commit 5b31862a1301d02e885c8f50ca26131202f1721d
Author: funkye <jian...@apache.org>
AuthorDate: Fri Jan 3 15:26:46 2025 +0800
optimize: support instance registration to the registry center (#7089)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../metadata/{namingserver => }/Instance.java | 30 +-------
.../common/metadata/namingserver/InstanceTest.java | 1 +
.../seata/core/rpc/netty/NettyServerBootstrap.java | 13 +++-
.../seata/discovery/registry/RegistryService.java | 27 +++++++
.../NamingserverRegistryServiceImpl.java | 23 +++---
.../org/apache/seata/mockserver/MockServer.java | 3 +
.../main/java/org/apache/seata/server/Server.java | 10 +--
.../server/controller/VGroupMappingController.java | 2 +-
...verInstance.java => ServerInstanceFactory.java} | 85 ++++++++++++----------
.../store/DataBaseVGroupMappingStoreManager.java | 2 +-
.../storage/db/store/VGroupMappingDataBaseDAO.java | 2 +-
.../store/RedisVGroupMappingStoreManager.java | 2 +-
.../server/store/VGroupMappingStoreManager.java | 2 +-
.../store/RedisVGroupMappingStoreManagerTest.java | 2 +-
16 files changed, 114 insertions(+), 92 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 041cc11c5b..b1afbb58d1 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -16,6 +16,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6828](https://github.com/apache/incubator-seata/pull/6828)] spring boot
compatible with file.conf and registry.conf
- [[#7012](https://github.com/apache/incubator-seata/pull/7012)] When the
number of primary keys exceeds 1000, use union to concatenate the SQL
- [[#7075](https://github.com/apache/incubator-seata/pull/7075)] fast fail
when channel is null
+- [[#7089](https://github.com/apache/incubator-seata/pull/7089)] support
instance registration to the registry center
- [[#7093](https://github.com/apache/incubator-seata/pull/7093)] add a test
workflow for JDK 21
### security:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 387f0285f1..0cf918bf87 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -16,6 +16,7 @@
- [[#6828](https://github.com/apache/incubator-seata/pull/6828)]
seata-spring-boot-starter兼容file.conf和registry.conf
- [[#7012](https://github.com/apache/incubator-seata/pull/7012)]
当主键超过1000个时，使用union拼接sql，可以使用索引
- [[#7075](https://github.com/apache/incubator-seata/pull/7075)]
当channel为空时，快速失败，以便于减少不必要的等待
+- [[#7089](https://github.com/apache/incubator-seata/pull/7089)]
新增instance注册到注册中心的接口
- [[#7093](https://github.com/apache/incubator-seata/pull/7093)] 增加jdk21的工作流测试
### security:
diff --git
a/common/src/main/java/org/apache/seata/common/metadata/namingserver/Instance.java
b/common/src/main/java/org/apache/seata/common/metadata/Instance.java
similarity index 79%
rename from
common/src/main/java/org/apache/seata/common/metadata/namingserver/Instance.java
rename to common/src/main/java/org/apache/seata/common/metadata/Instance.java
index 3159dc4a42..e588df0e98 100644
---
a/common/src/main/java/org/apache/seata/common/metadata/namingserver/Instance.java
+++ b/common/src/main/java/org/apache/seata/common/metadata/Instance.java
@@ -14,27 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.seata.common.metadata.namingserver;
+package org.apache.seata.common.metadata;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.seata.common.metadata.ClusterRole;
-import org.apache.seata.common.metadata.Node;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import static org.apache.seata.common.util.CollectionUtils.mapToJsonString;
-
-
public class Instance {
private String namespace;
private String clusterName;
private String unit;
- private Node.Endpoint control = new Node.Endpoint();
- private Node.Endpoint transaction = new Node.Endpoint();
+ private Node.Endpoint control;
+ private Node.Endpoint transaction;
private double weight = 1.0;
private boolean healthy = true;
private long term;
@@ -169,25 +164,6 @@ public class Instance {
}
}
-
- public Map<String, String> toMap() {
- Map<String, String> resultMap = new HashMap<>();
-
-
- resultMap.put("namespace", namespace);
- resultMap.put("clusterName", clusterName);
- resultMap.put("unit", unit);
- resultMap.put("control", control.toString());
- resultMap.put("transaction", transaction.toString());
- resultMap.put("weight", String.valueOf(weight));
- resultMap.put("healthy", String.valueOf(healthy));
- resultMap.put("term", String.valueOf(term));
- resultMap.put("timestamp", String.valueOf(timestamp));
- resultMap.put("metadata", mapToJsonString(metadata));
-
- return resultMap;
- }
-
private static class SingletonHolder {
private static final Instance SERVER_INSTANCE = new Instance();
}
diff --git
a/common/src/test/java/org/apache/seata/common/metadata/namingserver/InstanceTest.java
b/common/src/test/java/org/apache/seata/common/metadata/namingserver/InstanceTest.java
index fb9ddf559f..55741a835f 100644
---
a/common/src/test/java/org/apache/seata/common/metadata/namingserver/InstanceTest.java
+++
b/common/src/test/java/org/apache/seata/common/metadata/namingserver/InstanceTest.java
@@ -19,6 +19,7 @@ package org.apache.seata.common.metadata.namingserver;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.seata.common.metadata.ClusterRole;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.metadata.Node;
import org.junit.jupiter.api.Test;
diff --git
a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java
b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java
index b589396e5a..ac4632ce75 100644
---
a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java
+++
b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyServerBootstrap.java
@@ -34,6 +34,8 @@ import io.netty.channel.socket.SocketChannel;
import io.netty.handler.timeout.IdleStateHandler;
import org.apache.seata.common.ConfigurationKeys;
import org.apache.seata.common.XID;
+import org.apache.seata.common.metadata.Instance;
+import org.apache.seata.common.metadata.Node;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.config.ConfigurationFactory;
import org.apache.seata.core.rpc.RemotingBootstrap;
@@ -170,9 +172,13 @@ public class NettyServerBootstrap implements
RemotingBootstrap {
try {
this.serverBootstrap.bind(port).sync();
LOGGER.info("Server started, service listen port: {}",
getListenPort());
- InetSocketAddress address = new
InetSocketAddress(XID.getIpAddress(), XID.getPort());
+ Instance instance = Instance.getInstance();
+ // Lines 177-180 are just for compatibility with test cases
+ if (instance.getTransaction() == null) {
+ Instance.getInstance().setTransaction(new
Node.Endpoint(XID.getIpAddress(), XID.getPort(), "netty"));
+ }
for (RegistryService<?> registryService :
MultiRegistryFactory.getInstances()) {
- registryService.register(address);
+ registryService.register(Instance.getInstance());
}
initialized.set(true);
} catch (SocketException se) {
@@ -189,9 +195,8 @@ public class NettyServerBootstrap implements
RemotingBootstrap {
LOGGER.info("Shutting server down, the listen port: {}",
XID.getPort());
}
if (initialized.get()) {
- InetSocketAddress address = new
InetSocketAddress(XID.getIpAddress(), XID.getPort());
for (RegistryService registryService :
MultiRegistryFactory.getInstances()) {
- registryService.unregister(address);
+ registryService.unregister(Instance.getInstance());
registryService.close();
}
//wait a few seconds for server transport
diff --git
a/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryService.java
b/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryService.java
index efc997b20b..93a3cfd1b8 100644
---
a/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryService.java
+++
b/discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryService.java
@@ -16,6 +16,7 @@
*/
package org.apache.seata.discovery.registry;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.util.CollectionUtils;
import org.apache.seata.config.ConfigurationFactory;
@@ -61,16 +62,42 @@ public interface RegistryService<T> {
* @param address the address
* @throws Exception the exception
*/
+ @Deprecated
void register(InetSocketAddress address) throws Exception;
+ /**
+ * Register.
+ *
+ * @param instance the address
+ * @throws Exception the exception
+ */
+ default void register(Instance instance) throws Exception {
+ InetSocketAddress inetSocketAddress =
+ new InetSocketAddress(instance.getTransaction().getHost(),
instance.getTransaction().getPort());
+ register(inetSocketAddress);
+ }
+
/**
* Unregister.
*
* @param address the address
* @throws Exception the exception
*/
+ @Deprecated
void unregister(InetSocketAddress address) throws Exception;
+ /**
+ * Unregister.
+ *
+ * @param instance the instance
+ * @throws Exception the exception
+ */
+ default void unregister(Instance instance) throws Exception {
+ InetSocketAddress inetSocketAddress =
+ new InetSocketAddress(instance.getTransaction().getHost(),
instance.getTransaction().getPort());
+ unregister(inetSocketAddress);
+ }
+
/**
* Subscribe.
*
diff --git
a/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
b/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
index fa53bd45f1..88386253fa 100644
---
a/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
+++
b/discovery/seata-discovery-namingserver/src/main/java/org/apache/seata/discovery/registry/namingserver/NamingserverRegistryServiceImpl.java
@@ -47,8 +47,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.entity.ContentType;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.EntityUtils;
-import org.apache.seata.common.metadata.Node;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.metadata.namingserver.MetaResponse;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.common.util.CollectionUtils;
@@ -148,9 +147,11 @@ public class NamingserverRegistryServiceImpl implements
RegistryService<NamingLi
@Override
public void register(InetSocketAddress address) throws Exception {
- NetUtil.validAddress(address);
- Instance instance = Instance.getInstance();
- instance.setTransaction(new
Node.Endpoint(address.getAddress().getHostAddress(), address.getPort(),
"netty"));
+ register(Instance.getInstance());
+ }
+
+ @Override
+ public void register(Instance instance) throws Exception {
instance.setTimestamp(System.currentTimeMillis());
doRegister(instance, getNamingAddrs());
}
@@ -198,11 +199,15 @@ public class NamingserverRegistryServiceImpl implements
RegistryService<NamingLi
}
}
+
+
+ @Override
+ public void unregister(InetSocketAddress inetSocketAddress) {
+ unregister(Instance.getInstance());
+ }
+
@Override
- public void unregister(InetSocketAddress address) {
- NetUtil.validAddress(address);
- Instance instance = Instance.getInstance();
- instance.setTransaction(new
Node.Endpoint(address.getAddress().getHostAddress(), address.getPort(),
"netty"));
+ public void unregister(Instance instance) {
for (String urlSuffix : getNamingAddrs()) {
String url = HTTP_PREFIX + urlSuffix + "/naming/v1/unregister?";
String unit = instance.getUnit();
diff --git
a/mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
b/mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
index fb40440d02..b04f1c7b6e 100644
--- a/mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
+++ b/mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
@@ -22,6 +22,8 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.seata.common.XID;
+import org.apache.seata.common.metadata.Instance;
+import org.apache.seata.common.metadata.Node;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.common.util.NetUtil;
import org.apache.seata.common.util.NumberUtils;
@@ -78,6 +80,7 @@ public class MockServer {
XID.setIpAddress(NetUtil.getLocalIp());
XID.setPort(port);
// init snowflake for transactionId, branchId
+ Instance.getInstance().setTransaction(new
Node.Endpoint(XID.getIpAddress(),XID.getPort(),"netty"));
UUIDGenerator.init(1L);
MockCoordinator coordinator =
MockCoordinator.getInstance();
diff --git a/server/src/main/java/org/apache/seata/server/Server.java
b/server/src/main/java/org/apache/seata/server/Server.java
index c699ef037b..39648dae82 100644
--- a/server/src/main/java/org/apache/seata/server/Server.java
+++ b/server/src/main/java/org/apache/seata/server/Server.java
@@ -31,12 +31,11 @@ import org.apache.seata.config.ConfigurationFactory;
import org.apache.seata.core.rpc.netty.NettyRemotingServer;
import org.apache.seata.core.rpc.netty.NettyServerConfig;
import org.apache.seata.server.coordinator.DefaultCoordinator;
-import org.apache.seata.server.instance.ServerInstance;
+import org.apache.seata.server.instance.ServerInstanceFactory;
import org.apache.seata.server.lock.LockerManagerFactory;
import org.apache.seata.server.metrics.MetricsManager;
import org.apache.seata.server.session.SessionHolder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
@@ -52,10 +51,9 @@ import static
org.apache.seata.spring.boot.autoconfigure.StarterConstants.REGIST
*/
@Component("seataServer")
public class Server {
- private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
@Resource
- ServerInstance serverInstance;
+ ServerInstanceFactory serverInstanceFactory;
/**
* The entry point of application.
@@ -106,7 +104,7 @@ public class Server {
coordinator.init();
nettyRemotingServer.setHandler(coordinator);
- serverInstance.serverInstanceInit();
+ serverInstanceFactory.serverInstanceInit();
// let ServerRunner do destroy instead ShutdownHook, see
https://github.com/seata/seata/issues/4028
ServerRunner.addDisposable(coordinator);
nettyRemotingServer.init();
diff --git
a/server/src/main/java/org/apache/seata/server/controller/VGroupMappingController.java
b/server/src/main/java/org/apache/seata/server/controller/VGroupMappingController.java
index 1d55855f5d..bf9edf9787 100644
---
a/server/src/main/java/org/apache/seata/server/controller/VGroupMappingController.java
+++
b/server/src/main/java/org/apache/seata/server/controller/VGroupMappingController.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.server.controller;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.result.Result;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
diff --git
a/server/src/main/java/org/apache/seata/server/instance/ServerInstance.java
b/server/src/main/java/org/apache/seata/server/instance/ServerInstanceFactory.java
similarity index 58%
rename from
server/src/main/java/org/apache/seata/server/instance/ServerInstance.java
rename to
server/src/main/java/org/apache/seata/server/instance/ServerInstanceFactory.java
index eecf39b071..78842461e7 100644
--- a/server/src/main/java/org/apache/seata/server/instance/ServerInstance.java
+++
b/server/src/main/java/org/apache/seata/server/instance/ServerInstanceFactory.java
@@ -16,11 +16,11 @@
*/
package org.apache.seata.server.instance;
+import org.apache.seata.common.XID;
import org.apache.seata.common.holder.ObjectHolder;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.metadata.Node;
-import org.apache.seata.common.metadata.namingserver.Instance;
import org.apache.seata.common.thread.NamedThreadFactory;
-import org.apache.seata.common.util.NetUtil;
import org.apache.seata.common.util.StringUtils;
import org.apache.seata.server.Server;
import org.apache.seata.server.ServerRunner;
@@ -48,8 +48,8 @@ import static
org.apache.seata.common.ConfigurationKeys.NAMING_SERVER;
import static
org.apache.seata.common.Constants.OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT;
-@Component("serverInstance")
-public class ServerInstance {
+@Component("serverInstanceFactory")
+public class ServerInstanceFactory {
@Resource
private RegistryProperties registryProperties;
@@ -61,53 +61,58 @@ public class ServerInstance {
private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
public void serverInstanceInit() {
- if (StringUtils.equals(registryProperties.getType(), NAMING_SERVER)) {
- VGroupMappingStoreManager vGroupMappingStoreManager =
SessionHolder.getRootVGroupMappingManager();
- EXECUTOR_SERVICE = new ScheduledThreadPoolExecutor(1, new
NamedThreadFactory("scheduledExcuter", 1, true));
- ConfigurableEnvironment environment = (ConfigurableEnvironment)
ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT);
-
- // load node properties
- Instance instance = Instance.getInstance();
- // load namespace
- String namespace = registryNamingServerProperties.getNamespace();
- instance.setNamespace(namespace);
- // load cluster name
- String clusterName = registryNamingServerProperties.getCluster();
- instance.setClusterName(clusterName);
-
- // load cluster type
- String clusterType = String.valueOf(StoreConfig.getSessionMode());
- instance.addMetadata("cluster-type", "raft".equals(clusterType) ?
clusterType : "default");
-
- // load unit name
- instance.setUnit(String.valueOf(UUID.randomUUID()));
-
- instance.setTerm(System.currentTimeMillis());
-
- // load node Endpoint
- instance.setControl(new Node.Endpoint(NetUtil.getLocalIp(),
Integer.parseInt(Objects.requireNonNull(environment.getProperty("server.port"))),
"http"));
-
- // load metadata
- for (PropertySource<?> propertySource :
environment.getPropertySources()) {
- if (propertySource instanceof EnumerablePropertySource) {
- EnumerablePropertySource<?> enumerablePropertySource =
(EnumerablePropertySource<?>) propertySource;
- for (String propertyName :
enumerablePropertySource.getPropertyNames()) {
- if (propertyName.startsWith(META_PREFIX)) {
-
instance.addMetadata(propertyName.substring(META_PREFIX.length()),
enumerablePropertySource.getProperty(propertyName));
- }
+ VGroupMappingStoreManager vGroupMappingStoreManager =
SessionHolder.getRootVGroupMappingManager();
+ ConfigurableEnvironment environment =
+
(ConfigurableEnvironment)ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT);
+
+ // load node properties
+ Instance instance = Instance.getInstance();
+ // load namespace
+ String namespace = registryNamingServerProperties.getNamespace();
+ instance.setNamespace(namespace);
+ // load cluster name
+ String clusterName = registryNamingServerProperties.getCluster();
+ instance.setClusterName(clusterName);
+
+ // load cluster type
+ String clusterType = String.valueOf(StoreConfig.getSessionMode());
+ instance.addMetadata("cluster-type", "raft".equals(clusterType) ?
clusterType : "default");
+
+ // load unit name
+ instance.setUnit(String.valueOf(UUID.randomUUID()));
+
+ instance.setTerm(System.currentTimeMillis());
+
+ // load node Endpoint
+ instance.setControl(new Node.Endpoint(XID.getIpAddress(),
+
Integer.parseInt(Objects.requireNonNull(environment.getProperty("server.port"))),
"http"));
+
+ // load metadata
+ for (PropertySource<?> propertySource :
environment.getPropertySources()) {
+ if (propertySource instanceof EnumerablePropertySource) {
+ EnumerablePropertySource<?> enumerablePropertySource =
(EnumerablePropertySource<?>)propertySource;
+ for (String propertyName :
enumerablePropertySource.getPropertyNames()) {
+ if (propertyName.startsWith(META_PREFIX)) {
+
instance.addMetadata(propertyName.substring(META_PREFIX.length()),
+
enumerablePropertySource.getProperty(propertyName));
}
}
}
+ }
+ instance.setTransaction(new Node.Endpoint(XID.getIpAddress(),
XID.getPort(), "netty"));
+ if (StringUtils.equals(registryProperties.getType(), NAMING_SERVER)) {
// load vgroup mapping relationship
instance.addMetadata("vGroup",
vGroupMappingStoreManager.loadVGroups());
-
+ EXECUTOR_SERVICE =
+ new ScheduledThreadPoolExecutor(1, new
NamedThreadFactory("heartbeat-namingserver", 1, true));
EXECUTOR_SERVICE.scheduleAtFixedRate(() -> {
try {
vGroupMappingStoreManager.notifyMapping();
} catch (Exception e) {
LOGGER.error("Naming server register Exception", e);
}
- }, registryNamingServerProperties.getHeartbeatPeriod(),
registryNamingServerProperties.getHeartbeatPeriod(), TimeUnit.MILLISECONDS);
+ }, registryNamingServerProperties.getHeartbeatPeriod(),
registryNamingServerProperties.getHeartbeatPeriod(),
+ TimeUnit.MILLISECONDS);
ServerRunner.addDisposable(EXECUTOR_SERVICE::shutdown);
}
}
diff --git
a/server/src/main/java/org/apache/seata/server/storage/db/store/DataBaseVGroupMappingStoreManager.java
b/server/src/main/java/org/apache/seata/server/storage/db/store/DataBaseVGroupMappingStoreManager.java
index d83ecf34c3..20072d8945 100644
---
a/server/src/main/java/org/apache/seata/server/storage/db/store/DataBaseVGroupMappingStoreManager.java
+++
b/server/src/main/java/org/apache/seata/server/storage/db/store/DataBaseVGroupMappingStoreManager.java
@@ -19,7 +19,7 @@ package org.apache.seata.server.storage.db.store;
import org.apache.seata.common.ConfigurationKeys;
import org.apache.seata.common.loader.EnhancedServiceLoader;
import org.apache.seata.common.loader.LoadLevel;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
import org.apache.seata.core.store.MappingDO;
diff --git
a/server/src/main/java/org/apache/seata/server/storage/db/store/VGroupMappingDataBaseDAO.java
b/server/src/main/java/org/apache/seata/server/storage/db/store/VGroupMappingDataBaseDAO.java
index 84fea262d5..1749ca04cb 100644
---
a/server/src/main/java/org/apache/seata/server/storage/db/store/VGroupMappingDataBaseDAO.java
+++
b/server/src/main/java/org/apache/seata/server/storage/db/store/VGroupMappingDataBaseDAO.java
@@ -18,7 +18,7 @@ package org.apache.seata.server.storage.db.store;
import org.apache.seata.common.exception.ErrorCode;
import org.apache.seata.common.exception.SeataRuntimeException;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.util.IOUtil;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
diff --git
a/server/src/main/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManager.java
b/server/src/main/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManager.java
index 1367ad281f..4422bdc33f 100644
---
a/server/src/main/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManager.java
+++
b/server/src/main/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManager.java
@@ -18,7 +18,7 @@ package org.apache.seata.server.storage.redis.store;
import org.apache.seata.common.exception.RedisException;
import org.apache.seata.common.loader.LoadLevel;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.common.util.StringUtils;
import org.apache.seata.core.store.MappingDO;
import org.apache.seata.server.storage.redis.JedisPooledFactory;
diff --git
a/server/src/main/java/org/apache/seata/server/store/VGroupMappingStoreManager.java
b/server/src/main/java/org/apache/seata/server/store/VGroupMappingStoreManager.java
index d4ce6a5412..f2b2b8bd4f 100644
---
a/server/src/main/java/org/apache/seata/server/store/VGroupMappingStoreManager.java
+++
b/server/src/main/java/org/apache/seata/server/store/VGroupMappingStoreManager.java
@@ -17,7 +17,7 @@
package org.apache.seata.server.store;
import org.apache.seata.common.XID;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.core.store.MappingDO;
import org.apache.seata.discovery.registry.MultiRegistryFactory;
import org.apache.seata.discovery.registry.RegistryService;
diff --git
a/server/src/test/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManagerTest.java
b/server/src/test/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManagerTest.java
index 755c10759c..49418ae807 100644
---
a/server/src/test/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/storage/redis/store/RedisVGroupMappingStoreManagerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.seata.server.storage.redis.store;
-import org.apache.seata.common.metadata.namingserver.Instance;
+import org.apache.seata.common.metadata.Instance;
import org.apache.seata.core.store.MappingDO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
