Update sumer-ospp 10376, to keep path with the newest commits in develop branch

.github/workflows/pr-e2e-test.yml

@@ -171,7 +171,7 @@ jobs:
  ask-config: "${{ secrets.ASK_CONFIG_VIRGINA }}"
  test-version: "${{ matrix.version }}"
  test-code-git: "https:/nacos-group/nacos-e2e.git"
- test-code-branch: "master"
+ test-code-branch: "main"
  test-code-path: "java/nacos-2X"
  test-cmd: 'mvn clean test -B'
  job-id: ${{ strategy.job-index }}

api/src/main/java/com/alibaba/nacos/api/config/ConfigType.java

@@ -58,6 +58,11 @@ public enum ConfigType {
  */
  YAML("yaml"),
 
+ /**
+ * config type is "toml".
+ */
+ TOML("toml"),
+
  /**
  * not a real type.
  */

client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java

@@ -54,7 +54,7 @@
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
 public class NacosNamingService implements NamingService {
 
- private static final String DEFAULT_NAMING_LOG_FILE_PATH =  "naming.log";
+ private static final String DEFAULT_NAMING_LOG_FILE_PATH = "naming.log";
 
  private static final String UP = "UP";
 
@@ -93,13 +93,14 @@ private void init(Properties properties) throws NacosException {
  InitUtils.initSerialization();
  InitUtils.initWebRootContext(nacosClientProperties);
  initLogName(nacosClientProperties);
-
+  
  this.notifierEventScope = UUID.randomUUID().toString();
  this.changeNotifier = new InstancesChangeNotifier(this.notifierEventScope);
  NotifyCenter.registerToPublisher(InstancesChangeEvent.class, 16384);
  NotifyCenter.registerSubscriber(changeNotifier);
  this.serviceInfoHolder = new ServiceInfoHolder(namespace, this.notifierEventScope, nacosClientProperties);
- this.clientProxy = new NamingClientProxyDelegate(this.namespace, serviceInfoHolder, nacosClientProperties, changeNotifier);
+ this.clientProxy = new NamingClientProxyDelegate(this.namespace, serviceInfoHolder, nacosClientProperties,
+ changeNotifier);
  }
 
  private void initLogName(NacosClientProperties properties) {
@@ -241,7 +242,7 @@ public List<Instance> getAllInstances(String serviceName, String groupName, List
  serviceInfo = clientProxy.subscribe(serviceName, groupName, clusterString);
  }
  } else {
- serviceInfo = clientProxy.queryInstancesOfService(serviceName, groupName, clusterString, 0, false);
+ serviceInfo = clientProxy.queryInstancesOfService(serviceName, groupName, clusterString, false);
  }
  List<Instance> list;
  if (serviceInfo == null || CollectionUtils.isEmpty(list = serviceInfo.getHosts())) {
@@ -298,11 +299,11 @@ public List<Instance> selectInstances(String serviceName, String groupName, List
  String clusterString = StringUtils.join(clusters, ",");
  if (subscribe) {
  serviceInfo = serviceInfoHolder.getServiceInfo(serviceName, groupName, clusterString);
- if (null == serviceInfo) {
+ if (null == serviceInfo || !clientProxy.isSubscribed(serviceName, groupName, clusterString)) {
  serviceInfo = clientProxy.subscribe(serviceName, groupName, clusterString);
  }
  } else {
- serviceInfo = clientProxy.queryInstancesOfService(serviceName, groupName, clusterString, 0, false);
+ serviceInfo = clientProxy.queryInstancesOfService(serviceName, groupName, clusterString, false);
  }
  return selectInstances(serviceInfo, healthy);
  }
@@ -368,13 +369,12 @@ public Instance selectOneHealthyInstance(String serviceName, String groupName, L
  String clusterString = StringUtils.join(clusters, ",");
  if (subscribe) {
  ServiceInfo serviceInfo = serviceInfoHolder.getServiceInfo(serviceName, groupName, clusterString);
- if (null == serviceInfo) {
+ if (null == serviceInfo || !clientProxy.isSubscribed(serviceName, groupName, clusterString)) {
  serviceInfo = clientProxy.subscribe(serviceName, groupName, clusterString);
  }
  return Balancer.RandomByWeight.selectHost(serviceInfo);
  } else {
- ServiceInfo serviceInfo = clientProxy
- .queryInstancesOfService(serviceName, groupName, clusterString, 0, false);
+ ServiceInfo serviceInfo = clientProxy.queryInstancesOfService(serviceName, groupName, clusterString, false);
  return Balancer.RandomByWeight.selectHost(serviceInfo);
  }
  }
@@ -467,6 +467,6 @@ public void shutDown() throws NacosException {
  serviceInfoHolder.shutdown();
  clientProxy.shutdown();
  NotifyCenter.deregisterSubscriber(changeNotifier);
-
+  
  }
 }

client/src/main/java/com/alibaba/nacos/client/naming/core/ServerListManager.java

@@ -25,6 +25,8 @@
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.alibaba.nacos.client.naming.utils.InitUtils;
 import com.alibaba.nacos.client.naming.utils.NamingHttpUtil;
+import com.alibaba.nacos.client.utils.ContextPathUtil;
+import com.alibaba.nacos.client.utils.ParamUtil;
 import com.alibaba.nacos.common.executor.NameThreadFactory;
 import com.alibaba.nacos.common.http.HttpRestResult;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
@@ -50,7 +52,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.alibaba.nacos.client.utils.LogUtils.NAMING_LOGGER;
-import static com.alibaba.nacos.common.constant.RequestUrlConstants.HTTP_PREFIX;
 
 /**
  * Server list manager.
@@ -74,6 +75,10 @@ public class ServerListManager implements ServerListFactory, Closeable {
  private ScheduledExecutorService refreshServerListExecutor;
 
  private String endpoint;
+
+ private String contentPath = ParamUtil.getDefaultContextPath();
+
+ private String serverListName = ParamUtil.getDefaultNodesPath();
 
  private String nacosDomain;
 
@@ -96,6 +101,16 @@ public ServerListManager(NacosClientProperties properties, String namespace) {
  private void initServerAddr(NacosClientProperties properties) {
  this.endpoint = InitUtils.initEndpoint(properties);
  if (StringUtils.isNotEmpty(endpoint)) {
+
+ String contentPathTmp = properties.getProperty(PropertyKeyConst.CONTEXT_PATH);
+ if (!StringUtils.isBlank(contentPathTmp)) {
+ this.contentPath = contentPathTmp;
+ }
+ String serverListNameTmp = properties.getProperty(PropertyKeyConst.CLUSTER_NAME);
+ if (!StringUtils.isBlank(serverListNameTmp)) {
+ this.serverListName = serverListNameTmp;
+ }
+
  this.serversFromEndpoint = getServerListFromEndpoint();
  refreshServerListExecutor = new ScheduledThreadPoolExecutor(1,
  new NameThreadFactory("com.alibaba.nacos.client.naming.server.list.refresher"));
@@ -115,7 +130,10 @@ private void initServerAddr(NacosClientProperties properties) {
 
  private List<String> getServerListFromEndpoint() {
  try {
- String urlString = HTTP_PREFIX + endpoint + "/nacos/serverlist";
+ StringBuilder addressServerUrlTem = new StringBuilder(
+ String.format("http://%s%s/%s", this.endpoint,
+ ContextPathUtil.normalizeContextPath(this.contentPath), this.serverListName));
+ String urlString = addressServerUrlTem.toString();
  Header header = NamingHttpUtil.builderHeader();
  Query query = StringUtils.isNotBlank(namespace)
  ? Query.newInstance().addParam("namespace", namespace)

client/src/main/java/com/alibaba/nacos/client/naming/core/ServiceInfoUpdateService.java

@@ -77,7 +77,8 @@ private boolean isAsyncQueryForSubscribeService(NacosClientProperties properties
  if (properties == null || !properties.containsKey(PropertyKeyConst.NAMING_ASYNC_QUERY_SUBSCRIBE_SERVICE)) {
  return false;
  }
- return ConvertUtils.toBoolean(properties.getProperty(PropertyKeyConst.NAMING_ASYNC_QUERY_SUBSCRIBE_SERVICE), false);
+ return ConvertUtils.toBoolean(properties.getProperty(PropertyKeyConst.NAMING_ASYNC_QUERY_SUBSCRIBE_SERVICE),
+ false);
  }
 
  private int initPollingThreadCount(NacosClientProperties properties) {
@@ -188,14 +189,14 @@ public void run() {
 
  ServiceInfo serviceObj = serviceInfoHolder.getServiceInfoMap().get(serviceKey);
  if (serviceObj == null) {
- serviceObj = namingClientProxy.queryInstancesOfService(serviceName, groupName, clusters, 0, false);
+ serviceObj = namingClientProxy.queryInstancesOfService(serviceName, groupName, clusters, false);
  serviceInfoHolder.processServiceInfo(serviceObj);
  lastRefTime = serviceObj.getLastRefTime();
  return;
  }
 
  if (serviceObj.getLastRefTime() <= lastRefTime) {
- serviceObj = namingClientProxy.queryInstancesOfService(serviceName, groupName, clusters, 0, false);
+ serviceObj = namingClientProxy.queryInstancesOfService(serviceName, groupName, clusters, false);
  serviceInfoHolder.processServiceInfo(serviceObj);
  }
  lastRefTime = serviceObj.getLastRefTime();

client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxy.java

@@ -91,13 +91,12 @@ public interface NamingClientProxy extends Closeable {
  * @param serviceName service name
  * @param groupName group name
  * @param clusters clusters
- * @param udpPort udp port
  * @param healthyOnly healthy only
  * @return service info
  * @throws NacosException nacos exception
  */
- ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters, int udpPort,
- boolean healthyOnly) throws NacosException;
+ ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters, boolean healthyOnly)
+ throws NacosException;
 
  /**
  * Query Service.

client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java

@@ -65,8 +65,8 @@ public class NamingClientProxyDelegate implements NamingClientProxy {
 
  private ScheduledExecutorService executorService;
 
- public NamingClientProxyDelegate(String namespace, ServiceInfoHolder serviceInfoHolder, NacosClientProperties properties,
- InstancesChangeNotifier changeNotifier) throws NacosException {
+ public NamingClientProxyDelegate(String namespace, ServiceInfoHolder serviceInfoHolder,
+ NacosClientProperties properties, InstancesChangeNotifier changeNotifier) throws NacosException {
  this.serviceInfoUpdateService = new ServiceInfoUpdateService(properties, serviceInfoHolder, this,
  changeNotifier);
  this.serverListManager = new ServerListManager(properties, namespace);
@@ -88,9 +88,8 @@ private void initSecurityProxy(NacosClientProperties properties) {
  });
  final Properties nacosClientPropertiesView = properties.asProperties();
  this.securityProxy.login(nacosClientPropertiesView);
- this.executorService
- .scheduleWithFixedDelay(() -> securityProxy.login(nacosClientPropertiesView), 0, SECURITY_INFO_REFRESH_INTERVAL_MILLS,
- TimeUnit.MILLISECONDS);
+ this.executorService.scheduleWithFixedDelay(() -> securityProxy.login(nacosClientPropertiesView), 0,
+ SECURITY_INFO_REFRESH_INTERVAL_MILLS, TimeUnit.MILLISECONDS);
  }
 
  @Override
@@ -131,9 +130,9 @@ public void updateInstance(String serviceName, String groupName, Instance instan
  }
 
  @Override
- public ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters, int udpPort,
+ public ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters,
  boolean healthyOnly) throws NacosException {
- return grpcClientProxy.queryInstancesOfService(serviceName, groupName, clusters, udpPort, healthyOnly);
+ return grpcClientProxy.queryInstancesOfService(serviceName, groupName, clusters, healthyOnly);
  }
 
  @Override
@@ -178,8 +177,8 @@ public ServiceInfo subscribe(String serviceName, String groupName, String cluste
 
  @Override
  public void unsubscribe(String serviceName, String groupName, String clusters) throws NacosException {
- NAMING_LOGGER
- .debug("[UNSUBSCRIBE-SERVICE] service:{}, group:{}, cluster:{} ", serviceName, groupName, clusters);
+ NAMING_LOGGER.debug("[UNSUBSCRIBE-SERVICE] service:{}, group:{}, cluster:{} ", serviceName, groupName,
+ clusters);
  serviceInfoUpdateService.stopUpdateIfContain(serviceName, groupName, clusters);
  grpcClientProxy.unsubscribe(serviceName, groupName, clusters);
  }

client/src/main/java/com/alibaba/nacos/client/naming/remote/gprc/NamingGrpcClientProxy.java

@@ -54,8 +54,8 @@
 import com.alibaba.nacos.common.remote.ConnectionType;
 import com.alibaba.nacos.common.remote.client.RpcClient;
 import com.alibaba.nacos.common.remote.client.RpcClientFactory;
-import com.alibaba.nacos.common.remote.client.ServerListFactory;
 import com.alibaba.nacos.common.remote.client.RpcClientTlsConfig;
+import com.alibaba.nacos.common.remote.client.ServerListFactory;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 
@@ -139,8 +139,10 @@ public void batchRegisterService(String serviceName, String groupName, List<Inst
  @Override
  public void batchDeregisterService(String serviceName, String groupName, List<Instance> instances)
  throws NacosException {
- List<Instance> retainInstance = getRetainInstance(serviceName, groupName, instances);
- batchRegisterService(serviceName, groupName, retainInstance);
+ synchronized (redoService.getRegisteredInstances()) {
+ List<Instance> retainInstance = getRetainInstance(serviceName, groupName, instances);
+ batchRegisterService(serviceName, groupName, retainInstance);
+ }
  }
 
  /**
@@ -218,11 +220,20 @@ public void doRegisterService(String serviceName, String groupName, Instance ins
 
  @Override
  public void deregisterService(String serviceName, String groupName, Instance instance) throws NacosException {
- NAMING_LOGGER
- .info("[DEREGISTER-SERVICE] {} deregistering service {} with instance: {}", namespaceId, serviceName,
- instance);
- redoService.instanceDeregister(serviceName, groupName);
- doDeregisterService(serviceName, groupName, instance);
+ NAMING_LOGGER.info("[DEREGISTER-SERVICE] {} deregistering service {} with instance: {}", namespaceId,
+ serviceName, instance);
+ String key = NamingUtils.getGroupedName(serviceName, groupName);
+ InstanceRedoData instanceRedoData = redoService.getRegisteredInstancesByKey(key);
+ if (instanceRedoData instanceof BatchInstanceRedoData) {
+ List<Instance> instances = new ArrayList<>();
+ if (null != instance) {
+ instances.add(instance);
+ }
+ batchDeregisterService(serviceName, groupName, instances);
+ } else {
+ redoService.instanceDeregister(serviceName, groupName);
+ doDeregisterService(serviceName, groupName, instance);
+ }
  }
 
  /**
@@ -246,12 +257,11 @@ public void updateInstance(String serviceName, String groupName, Instance instan
  }
 
  @Override
- public ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters, int udpPort,
+ public ServiceInfo queryInstancesOfService(String serviceName, String groupName, String clusters,
  boolean healthyOnly) throws NacosException {
  ServiceQueryRequest request = new ServiceQueryRequest(namespaceId, serviceName, groupName);
  request.setCluster(clusters);
  request.setHealthyOnly(healthyOnly);
- request.setUdpPort(udpPort);
  QueryServiceResponse response = requestToServer(request, QueryServiceResponse.class);
  return response.getServiceInfo();
  }
@@ -321,8 +331,8 @@ public ServiceInfo doSubscribe(String serviceName, String groupName, String clus
  @Override
  public void unsubscribe(String serviceName, String groupName, String clusters) throws NacosException {
  if (NAMING_LOGGER.isDebugEnabled()) {
- NAMING_LOGGER
- .debug("[GRPC-UNSUBSCRIBE] service:{}, group:{}, cluster:{} ", serviceName, groupName, clusters);
+ NAMING_LOGGER.debug("[GRPC-UNSUBSCRIBE] service:{}, group:{}, cluster:{} ", serviceName, groupName,
+ clusters);
  }
  redoService.subscriberDeregister(serviceName, groupName, clusters);
  doUnsubscribe(serviceName, groupName, clusters);

client/src/main/java/com/alibaba/nacos/client/naming/remote/gprc/redo/NamingGrpcRedoService.java

@@ -68,6 +68,10 @@ public NamingGrpcRedoService(NamingGrpcClientProxy clientProxy) {
  DEFAULT_REDO_DELAY, TimeUnit.MILLISECONDS);
  }
 
+ public ConcurrentMap<String, InstanceRedoData> getRegisteredInstances() {
+ return registeredInstances;
+ }
+
  public boolean isConnected() {
  return connected;
  }