Merge pull request #9707 from alibaba/develop

Merge develop into master to release 2.2.0

.github/workflows/ci.yml

@@ -21,17 +21,19 @@ jobs:
  java: [8]
  steps:
  - name: Cache Maven Repos
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: ~/.m2/repository
  key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
  restore-keys: |
  ${{ runner.os }}-maven-
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
  with:
  java-version: ${{ matrix.java }}
+ distribution: 'zulu'
+ architecture: x64
  - name: Check with Maven
  run: mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true
  - name: Build with Maven

.github/workflows/it.yml

@@ -21,15 +21,15 @@ jobs:
  java: [8, 8.0.192, 11, 11.0.3]
  steps:
  - name: Cache Maven Repos
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: ~/.m2/repository
  key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
  restore-keys: |
  ${{ runner.os }}-maven-
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  java-version: ${{ matrix.java }}
  distribution: 'zulu'

address/src/main/java/com/alibaba/nacos/address/component/AddressServerGeneratorManager.java

@@ -18,8 +18,8 @@
 
 import com.alibaba.nacos.address.constant.AddressServerConstants;
 import com.alibaba.nacos.api.common.Constants;
+import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.common.utils.InternetAddressUtil;
-import com.alibaba.nacos.naming.core.Instance;
 import com.alibaba.nacos.common.utils.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -76,9 +76,9 @@ public List<Instance> generateInstancesByIps(String serviceName, String rawProdu
  instance.setPort(Integer.parseInt(ipAndPort[1]));
  instance.setClusterName(clusterName);
  instance.setServiceName(serviceName);
- instance.setTenant(Constants.DEFAULT_NAMESPACE_ID);
- instance.setApp(rawProductName);
  instance.setEphemeral(false);
+ instance.getMetadata().put("app", rawProductName);
+ instance.getMetadata().put("tenant", Constants.DEFAULT_NAMESPACE_ID);
  instanceList.add(instance);
  }
 
@@ -99,7 +99,7 @@ private String[] generateIpAndPort(String ip) {
  * @param instanceList a instance set will generate string response to client.
  * @return the result of response to client
  */
- public String generateResponseIps(List<Instance> instanceList) {
+ public String generateResponseIps(List<com.alibaba.nacos.api.naming.pojo.Instance> instanceList) {
 
  StringBuilder ips = new StringBuilder();
  instanceList.forEach(instance -> {

address/src/main/java/com/alibaba/nacos/address/controller/AddressServerClusterController.java

@@ -21,13 +21,19 @@
 import com.alibaba.nacos.address.constant.AddressServerConstants;
 import com.alibaba.nacos.address.misc.Loggers;
 import com.alibaba.nacos.api.common.Constants;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.healthcheck.AbstractHealthChecker;
+import com.alibaba.nacos.api.naming.utils.NamingUtils;
 import com.alibaba.nacos.common.utils.InternetAddressUtil;
-import com.alibaba.nacos.naming.core.Cluster;
-import com.alibaba.nacos.naming.core.Instance;
-import com.alibaba.nacos.naming.core.Service;
-import com.alibaba.nacos.naming.core.ServiceManager;
 import com.alibaba.nacos.common.utils.StringUtils;
+import com.alibaba.nacos.naming.core.ClusterOperator;
+import com.alibaba.nacos.naming.core.InstanceOperator;
+import com.alibaba.nacos.naming.core.v2.ServiceManager;
+import com.alibaba.nacos.naming.core.v2.metadata.ClusterMetadata;
+import com.alibaba.nacos.naming.core.v2.metadata.NamingMetadataManager;
+import com.alibaba.nacos.naming.core.v2.metadata.ServiceMetadata;
+import com.alibaba.nacos.naming.core.v2.pojo.Service;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +42,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Address server cluster controller.
@@ -47,15 +54,22 @@
 @RequestMapping({AddressServerConstants.ADDRESS_SERVER_REQUEST_URL + "/nodes"})
 public class AddressServerClusterController {
 
- private final ServiceManager serviceManager;
+ private final InstanceOperator instanceOperator;
+
+ private final NamingMetadataManager metadataManager;
+
+ private final ClusterOperator clusterOperator;
 
  private final AddressServerManager addressServerManager;
 
  private final AddressServerGeneratorManager addressServerGeneratorManager;
 
- public AddressServerClusterController(ServiceManager serviceManager, AddressServerManager addressServerManager,
+ public AddressServerClusterController(InstanceOperator instanceOperator, NamingMetadataManager metadataManager,
+ ClusterOperator clusterOperator, AddressServerManager addressServerManager,
  AddressServerGeneratorManager addressServerGeneratorManager) {
- this.serviceManager = serviceManager;
+ this.instanceOperator = instanceOperator;
+ this.metadataManager = metadataManager;
+ this.clusterOperator = clusterOperator;
  this.addressServerManager = addressServerManager;
  this.addressServerGeneratorManager = addressServerGeneratorManager;
  }
@@ -86,23 +100,13 @@ public ResponseEntity<String> postCluster(@RequestParam(required = false) String
  try {
  String serviceName = addressServerGeneratorManager.generateNacosServiceName(productName);
 
- Cluster clusterObj = new Cluster();
- clusterObj.setName(clusterName);
- clusterObj.setHealthChecker(new AbstractHealthChecker.None());
- serviceManager.createServiceIfAbsent(Constants.DEFAULT_NAMESPACE_ID, serviceName, false, clusterObj);
- String[] ipArray = addressServerManager.splitIps(ips);
- String checkResult = InternetAddressUtil.checkIPs(ipArray);
- if (InternetAddressUtil.checkOK(checkResult)) {
- List<Instance> instanceList = addressServerGeneratorManager
- .generateInstancesByIps(serviceName, rawProductName, clusterName, ipArray);
- for (Instance instance : instanceList) {
- serviceManager.registerInstance(Constants.DEFAULT_NAMESPACE_ID, serviceName, instance);
- }
+ Result result = registerCluster(serviceName, rawProductName, clusterName, ips);
+ if (InternetAddressUtil.checkOK(result.getCheckResult())) {
  responseEntity = ResponseEntity
  .ok("product=" + rawProductName + ",cluster=" + rawClusterName + "; put success with size="
- + instanceList.size());
+ + result.getSize());
  } else {
- responseEntity = ResponseEntity.status(HttpStatus.BAD_REQUEST).body(checkResult);
+ responseEntity = ResponseEntity.status(HttpStatus.BAD_REQUEST).body(result.getCheckResult());
  }
  } catch (Exception e) {
  responseEntity = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
@@ -111,6 +115,35 @@ public ResponseEntity<String> postCluster(@RequestParam(required = false) String
  return responseEntity;
  }
 
+ private Result registerCluster(String serviceName, String productName, String clusterName, String ips)
+ throws NacosException {
+ String serviceWithoutGroup = NamingUtils.getServiceName(serviceName);
+ String groupName = NamingUtils.getGroupName(serviceName);
+ Service service = Service.newService(Constants.DEFAULT_NAMESPACE_ID, groupName, serviceWithoutGroup, false);
+ service = ServiceManager.getInstance().getSingleton(service);
+ if (service.isEphemeral()) {
+ return new Result(
+ String.format("Service %s is ephemeral service, can't use as address server", serviceName), 0);
+ }
+ ServiceMetadata serviceMetadata = metadataManager.getServiceMetadata(service).orElse(new ServiceMetadata());
+ if (!serviceMetadata.getClusters().containsKey(clusterName)) {
+ ClusterMetadata metadata = new ClusterMetadata();
+ metadata.setHealthyCheckType(AbstractHealthChecker.None.TYPE);
+ metadata.setHealthChecker(new AbstractHealthChecker.None());
+ clusterOperator.updateClusterMetadata(Constants.DEFAULT_NAMESPACE_ID, serviceName, clusterName, metadata);
+ }
+ String[] ipArray = addressServerManager.splitIps(ips);
+ String checkResult = InternetAddressUtil.checkIPs(ipArray);
+ if (InternetAddressUtil.checkOK(checkResult)) {
+ List<Instance> instanceList = addressServerGeneratorManager
+ .generateInstancesByIps(serviceName, productName, clusterName, ipArray);
+ for (Instance instance : instanceList) {
+ instanceOperator.registerInstance(Constants.DEFAULT_NAMESPACE_ID, serviceName, instance);
+ }
+ }
+ return new Result(checkResult, ipArray.length);
+ }
+
  /**
  * Delete cluster.
  *
@@ -134,9 +167,12 @@ public ResponseEntity<String> deleteCluster(@RequestParam(required = false) Stri
  try {
 
  String serviceName = addressServerGeneratorManager.generateNacosServiceName(productName);
- Service service = serviceManager.getService(Constants.DEFAULT_NAMESPACE_ID, serviceName);
+ String serviceWithoutGroup = NamingUtils.getServiceName(serviceName);
+ String groupName = NamingUtils.getGroupName(serviceName);
+ Optional<com.alibaba.nacos.naming.core.v2.pojo.Service> service = com.alibaba.nacos.naming.core.v2.ServiceManager
+ .getInstance().getSingletonIfExist(Constants.DEFAULT_NAMESPACE_ID, groupName, serviceWithoutGroup);
 
- if (service == null) {
+ if (!service.isPresent()) {
  return ResponseEntity.status(HttpStatus.NOT_FOUND).body("product=" + rawProductName + " not found.");
  }
  if (StringUtils.isBlank(ips)) {
@@ -149,8 +185,9 @@ public ResponseEntity<String> deleteCluster(@RequestParam(required = false) Stri
  if (InternetAddressUtil.checkOK(checkResult)) {
  List<Instance> instanceList = addressServerGeneratorManager
  .generateInstancesByIps(serviceName, rawProductName, clusterName, ipArray);
- serviceManager.removeInstance(Constants.DEFAULT_NAMESPACE_ID, serviceName, false,
- instanceList.toArray(new Instance[0]));
+ for (Instance each : instanceList) {
+ instanceOperator.removeInstance(Constants.DEFAULT_NAMESPACE_ID, serviceName, each);
+ }
  } else {
  responseEntity = ResponseEntity.status(HttpStatus.BAD_REQUEST).body(checkResult);
  }
@@ -162,4 +199,23 @@ public ResponseEntity<String> deleteCluster(@RequestParam(required = false) Stri
  return responseEntity;
  }
 
+ private class Result {
+
+ private final String checkResult;
+
+ private final int size;
+
+ public Result(String checkResult, int size) {
+ this.checkResult = checkResult;
+ this.size = size;
+ }
+
+ public String getCheckResult() {
+ return checkResult;
+ }
+
+ public int getSize() {
+ return size;
+ }
+ }
 }

address/src/main/java/com/alibaba/nacos/address/controller/ServerListController.java

@@ -18,16 +18,24 @@
 
 import com.alibaba.nacos.address.component.AddressServerGeneratorManager;
 import com.alibaba.nacos.api.common.Constants;
-import com.alibaba.nacos.naming.core.Cluster;
-import com.alibaba.nacos.naming.core.Service;
-import com.alibaba.nacos.naming.core.ServiceManager;
+import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
+import com.alibaba.nacos.api.naming.utils.NamingUtils;
+import com.alibaba.nacos.naming.core.v2.ServiceManager;
+import com.alibaba.nacos.naming.core.v2.index.ServiceStorage;
+import com.alibaba.nacos.naming.core.v2.metadata.ClusterMetadata;
+import com.alibaba.nacos.naming.core.v2.metadata.NamingMetadataManager;
+import com.alibaba.nacos.naming.core.v2.metadata.ServiceMetadata;
+import com.alibaba.nacos.naming.core.v2.pojo.Service;
+import com.alibaba.nacos.naming.utils.ServiceUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Optional;
+
 /**
  * Server list controller.
  *
@@ -37,14 +45,17 @@
 @RestController
 public class ServerListController {
 
- private final ServiceManager serviceManager;
-
  private final AddressServerGeneratorManager addressServerBuilderManager;
 
- public ServerListController(ServiceManager serviceManager,
- AddressServerGeneratorManager addressServerBuilderManager) {
- this.serviceManager = serviceManager;
+ private final NamingMetadataManager metadataManager;
+
+ private final ServiceStorage serviceStorage;
+
+ public ServerListController(AddressServerGeneratorManager addressServerBuilderManager,
+ NamingMetadataManager metadataManager, ServiceStorage serviceStorage) {
  this.addressServerBuilderManager = addressServerBuilderManager;
+ this.metadataManager = metadataManager;
+ this.serviceStorage = serviceStorage;
  }
 
  /**
@@ -59,20 +70,22 @@ public ResponseEntity<String> getCluster(@PathVariable String product, @PathVari
 
  String productName = addressServerBuilderManager.generateProductName(product);
  String serviceName = addressServerBuilderManager.generateNacosServiceName(productName);
- Service service = serviceManager.getService(Constants.DEFAULT_NAMESPACE_ID, serviceName);
- if (service == null) {
-
+ String serviceWithoutGroup = NamingUtils.getServiceName(serviceName);
+ String groupName = NamingUtils.getGroupName(serviceName);
+ Optional<Service> service = ServiceManager.getInstance()
+ .getSingletonIfExist(Constants.DEFAULT_NAMESPACE_ID, groupName, serviceWithoutGroup);
+ if (!service.isPresent()) {
  return ResponseEntity.status(HttpStatus.NOT_FOUND).body("product=" + product + " not found.");
  }
-
- if (!service.getClusterMap().containsKey(cluster)) {
-  
+ ClusterMetadata metadata = metadataManager.getServiceMetadata(service.get()).orElse(new ServiceMetadata())
+  .getClusters().get(cluster);
+ if (null == metadata) {
  return ResponseEntity.status(HttpStatus.NOT_FOUND)
  .body("product=" + product + ",cluster=" + cluster + " not found.");
  }
-
- Cluster clusterObj = service.getClusterMap().get(cluster);
+ ServiceInfo serviceInfo = serviceStorage.getData(service.get());
+ serviceInfo = ServiceUtil.selectInstances(serviceInfo, cluster, false);
  return ResponseEntity.status(HttpStatus.OK)
- .body(addressServerBuilderManager.generateResponseIps(clusterObj.allIPs(false)));
+ .body(addressServerBuilderManager.generateResponseIps(serviceInfo.getHosts()));
  }
 }