Merge pull request #13173 from alibaba/develop

Release 2.5.1

Author: KomachiSion

.github/workflows/pr-ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Build distribution tar
         run: |
           mvn -Prelease-nacos -DskipTests clean install -U -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload distribution tar
         with:
           name: nacos
@@ -30,7 +30,7 @@ jobs:
         run: |
           mkdir -p ./pr
           echo ${{ github.event.pull_request.number }} > ./pr/pr.txt
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload PR number
         with:
           name: pr

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

@@ -31,18 +31,18 @@ jobs:
       version-json: ${{ steps.show_versions.outputs.version-json }}
     steps:
       - name: 'Download artifact'
-        uses: actions/github-script@v3.1.0
+        uses: actions/github-script@v6
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            let artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
                run_id: ${{ github.event.workflow_run.id }},
             });
-            var matchArtifactNacos = artifacts.data.artifacts.filter((artifact) => {
+            let matchArtifactNacos = artifacts.data.artifacts.filter((artifact) => {
                return artifact.name == "nacos"
             })[0];
-            var download = await github.actions.downloadArtifact({
+            let download = await github.rest.actions.downloadArtifact({
                owner: context.repo.owner,
                repo: context.repo.repo,
                artifact_id: matchArtifactNacos.id,
@@ -157,7 +157,7 @@ jobs:
                 branch: main
               repoType: git
               retries: 3
-              url: https://ghproxy.com/https://github.com/nacos-group/nacos-e2e.git
+              url: https://github.com/nacos-group/nacos-e2e.git
               values:
                 namespace: nacos-${{ github.run_id }}-${{ strategy.job-index }}
                 global:
@@ -226,7 +226,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -278,7 +278,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -333,7 +333,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -386,7 +386,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -437,7 +437,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -490,7 +490,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -529,19 +529,19 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: 'Download artifact'
-        uses: actions/github-script@v3.1.0
+        uses: actions/github-script@v6
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            let artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
                run_id: ${{ github.event.workflow_run.id }},
             });
             
-            var matchArtifactPR = artifacts.data.artifacts.filter((artifact) => {
+            let matchArtifactPR = artifacts.data.artifacts.filter((artifact) => {
                return artifact.name == "pr"
             })[0];
-            var download = await github.actions.downloadArtifact({
+            let download = await github.rest.actions.downloadArtifact({
                owner: context.repo.owner,
                repo: context.repo.repo,
                artifact_id: matchArtifactPR.id,

.github/workflows/push-ci.yaml

@@ -168,7 +168,7 @@ jobs:
                 branch: main
               repoType: git
               retries: 3
-              url: https://ghproxy.com/https://github.com/nacos-group/nacos-e2e.git
+              url: https://github.com/nacos-group/nacos-e2e.git
               values:
                 namespace: nacos-${{ github.run_id }}-${{ strategy.job-index }}
                 global:
@@ -238,7 +238,7 @@ jobs:
                 cpu: 2
                 memory: 2Gi
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -290,7 +290,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -345,7 +345,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -398,7 +398,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -449,7 +449,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:
@@ -500,7 +500,7 @@ jobs:
               RESOURCE_REQUIRE:
                 cpu: 2
                 memory: 2Gi
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         name: Upload test log
         with:

api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java

@@ -143,6 +143,11 @@ public String toString() {
      */
     public static final int CONFLICT = 409;
 
+    /**
+     * config already exists（配置已存在）.
+     */
+    public static final int CONFIG_ALREADY_EXISTS = 410;
+    
     /**
      * server error（server异常，如超时）.
      */

api/src/main/java/com/alibaba/nacos/api/model/v2/ErrorCode.java

@@ -110,6 +110,26 @@ public enum ErrorCode {
      */
     CONFIG_GRAY_NAME_UNRECOGNIZED_ERROR(20013, "config gray name not recognized"),
 
+    /**
+     * reach cluster quota.
+     */
+    OVER_CLUSTER_QUOTA(5031, "cluster capacity reach quota"),
+    
+    /**
+     * reach group quota.
+     */
+    OVER_GROUP_QUOTA(5032, "group capacity reach quota"),
+    
+    /**
+     * reach tenant quota.
+     */
+    OVER_TENANT_QUOTA(5033, "tenant capacity reach quota"),
+    
+    /**
+     * over max content size.
+     */
+    OVER_MAX_SIZE(5034, "config content size is over limit"),
+    
     /**
      *  service name error.
      */
@@ -217,6 +237,15 @@ public String getMsg() {
         return msg;
     }
 
+    public static ErrorCode getErrorCode(String name) {
+        for (ErrorCode errorCode : ErrorCode.values()) {
+            if (errorCode.name().equals(name)) {
+                return errorCode;
+            }
+        }
+        return null;
+    }
+    
     ErrorCode(Integer code, String msg) {
         this.code = code;
         this.msg = msg;

api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java

@@ -215,14 +215,17 @@ public String getKey() {
 
     @JsonIgnore
     public static String getKey(String name, String clusters) {
-        
         if (!isEmpty(clusters)) {
             return name + Constants.SERVICE_INFO_SPLITER + clusters;
         }
-        
         return name;
     }
-    
+
+    @JsonIgnore
+    public String getKeyWithoutClusters() {
+        return getGroupedServiceName();
+    }
+
     @JsonIgnore
     public String getKeyEncoded() {
         String serviceName = getGroupedServiceName();

client/pom.xml

@@ -76,11 +76,6 @@
             <artifactId>nacos-log4j2-adapter</artifactId>
         </dependency>
 
-        <dependency>
-            <artifactId>commons-codec</artifactId>
-            <groupId>commons-codec</groupId>
-        </dependency>
-        
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

client/src/main/java/com/alibaba/nacos/client/auth/impl/NacosClientAuthServiceImpl.java

@@ -19,6 +19,7 @@
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.client.auth.impl.process.HttpLoginProcessor;
+import com.alibaba.nacos.common.utils.RandomUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.plugin.auth.api.RequestResource;
@@ -35,6 +36,7 @@
  * @author wuyfee
  */
 
+@SuppressWarnings("checkstyle:SummaryJavadoc")
 public class NacosClientAuthServiceImpl extends AbstractClientAuthService {
 
     private static final Logger SECURITY_LOGGER = LoggerFactory.getLogger(NacosClientAuthServiceImpl.class);
@@ -97,7 +99,7 @@ public Boolean login(Properties properties) {
                 if (identityContext != null) {
                     if (identityContext.getAllKey().contains(NacosAuthLoginConstant.ACCESSTOKEN)) {
                         tokenTtl = Long.parseLong(identityContext.getParameter(NacosAuthLoginConstant.TOKENTTL));
-                        tokenRefreshWindow = tokenTtl / 10;
+                        tokenRefreshWindow = generateTokenRefreshWindow(tokenTtl);
                         lastRefreshTime = System.currentTimeMillis();
 
                         LoginIdentityContext newCtx = new LoginIdentityContext();
@@ -124,4 +126,15 @@ public LoginIdentityContext getLoginIdentityContext(RequestResource resource) {
     public void shutdown() throws NacosException {
 
     }
+    
+    /**
+     * Randomly generate TokenRefreshWindow, Avoid a large number of logins causing pressure on the Nacos server.
+     * @param tokenTtl TTL of token in seconds.
+     * @return tokenRefreshWindow, numerical range [tokenTtl/15 ~ tokenTtl/10]
+     */
+    public long generateTokenRefreshWindow(long tokenTtl) {
+        long startNumber = tokenTtl / 15;
+        long endNumber   = tokenTtl / 10;
+        return RandomUtils.nextLong(startNumber, endNumber);
+    }
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java

@@ -59,10 +59,10 @@
 import com.alibaba.nacos.common.remote.client.Connection;
 import com.alibaba.nacos.common.remote.client.ConnectionEventListener;
 import com.alibaba.nacos.common.remote.client.RpcClient;
+import com.alibaba.nacos.common.remote.client.RpcClientConfigFactory;
 import com.alibaba.nacos.common.remote.client.RpcClientFactory;
-import com.alibaba.nacos.common.remote.client.RpcClientTlsConfig;
-import com.alibaba.nacos.common.remote.client.RpcClientTlsConfigFactory;
 import com.alibaba.nacos.common.remote.client.ServerListFactory;
+import com.alibaba.nacos.common.remote.client.grpc.GrpcClientConfig;
 import com.alibaba.nacos.common.utils.ConnLabelsUtils;
 import com.alibaba.nacos.common.utils.ConvertUtils;
 import com.alibaba.nacos.common.utils.JacksonUtils;
@@ -1093,10 +1093,9 @@ private RpcClient ensureRpcClient(String taskId) throws NacosException {
                 Map<String, String> labels = getLabels();
                 Map<String, String> newLabels = new HashMap<>(labels);
                 newLabels.put("taskId", taskId);
-                RpcClientTlsConfig clientTlsConfig = RpcClientTlsConfigFactory.getInstance()
-                        .createSdkConfig(properties);
-                RpcClient rpcClient = RpcClientFactory.createClient(uuid + "_config-" + taskId, getConnectionType(),
-                        newLabels, clientTlsConfig);
+                GrpcClientConfig grpcClientConfig = RpcClientConfigFactory.getInstance()
+                        .createGrpcClientConfig(properties, newLabels);
+                RpcClient rpcClient = RpcClientFactory.createClient(uuid + "_config-" + taskId, getConnectionType(), grpcClientConfig);
                 if (rpcClient.isWaitInitiated()) {
                     initRpcClientHandler(rpcClient);
                     rpcClient.setTenant(getTenant());