Merge pull request #12723 from alibaba/develop

Upgrade to 2.4.3
alibaba · Oct 12, 2024 · f00cfec · f00cfec
2 parents 75e5de6 + f4f8b18
commit f00cfec
Show file tree

Hide file tree

Showing 35 changed files with 355 additions and 111 deletions.
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           mkdir -p ./pr
           echo ${{ github.event.number }} > ./pr/NR
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: pr
           path: pr/
diff --git a/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java b/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java
@@ -63,6 +63,8 @@ public class PropertyKeyConst {
 
     public static final String CONFIG_RETRY_TIME = "configRetryTime";
 
+    public static final String CONFIG_REQUEST_TIMEOUT = "configRequestTimeout";
+
     public static final String CLIENT_WORKER_MAX_THREAD_COUNT = "clientWorkerMaxThreadCount";
 
     public static final String CLIENT_WORKER_THREAD_COUNT = "clientWorkerThreadCount";

diff --git a/client/pom.xml b/client/pom.xml
@@ -146,6 +146,7 @@
                                             <exclude>META-INF/*.SF</exclude>
                                             <exclude>META-INF/*.DSA</exclude>
                                             <exclude>META-INF/*.RSA</exclude>
+                                            <exclude>**/module-info.class</exclude>
                                         </excludes>
                                     </filter>
                                     <filter>

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
@@ -138,6 +138,8 @@ public class ClientWorker implements Closeable {
 
     private long timeout;
 
+    private long requestTimeout;
+
     private final ConfigRpcTransportClient agent;
 
     private int taskPenaltyTime;
@@ -405,7 +407,7 @@ public CacheData addCacheDataIfAbsent(String dataId, String group, String tenant
                 cache.setTaskId(taskId);
                 // fix issue # 1317
                 if (enableRemoteSyncConfig) {
-                    ConfigResponse response = getServerConfig(dataId, group, tenant, 3000L, false);
+                    ConfigResponse response = getServerConfig(dataId, group, tenant, requestTimeout, false);
                     cache.setEncryptedDataKey(response.getEncryptedDataKey());
                     cache.setContent(response.getContent());
                 }
@@ -510,6 +512,8 @@ private int initWorkerThreadCount(NacosClientProperties properties) {
 
     private void init(NacosClientProperties properties) {
 
+        requestTimeout = ConvertUtils.toLong(properties.getProperty(PropertyKeyConst.CONFIG_REQUEST_TIMEOUT, "-1"));
+
         timeout = Math.max(ConvertUtils.toInt(properties.getProperty(PropertyKeyConst.CONFIG_LONG_POLL_TIMEOUT),
                 Constants.CONFIG_LONG_POLL_TIMEOUT), Constants.MIN_CONFIG_LONG_POLL_TIMEOUT);
 
@@ -927,7 +931,7 @@ private void refreshContentAndCheck(RpcClient rpcClient, CacheData cacheData, bo
             try {
 
                 ConfigResponse response = this.queryConfigInner(rpcClient, cacheData.dataId, cacheData.group,
-                        cacheData.tenant, 3000L, notify);
+                        cacheData.tenant, requestTimeout, notify);
                 cacheData.setEncryptedDataKey(response.getEncryptedDataKey());
                 cacheData.setContent(response.getContent());
                 if (null != response.getConfigType()) {
@@ -1198,7 +1202,7 @@ ConfigResponse queryConfigInner(RpcClient rpcClient, String dataId, String group
         }
 
         private Response requestProxy(RpcClient rpcClientInner, Request request) throws NacosException {
-            return requestProxy(rpcClientInner, request, 3000L);
+            return requestProxy(rpcClientInner, request, requestTimeout);
         }
 
         private Response requestProxy(RpcClient rpcClientInner, Request request, long timeoutMills)
@@ -1217,6 +1221,9 @@ private Response requestProxy(RpcClient rpcClientInner, Request request, long ti
                 throw new NacosException(NacosException.CLIENT_OVER_THRESHOLD,
                         "More than client-side current limit threshold");
             }
+            if (timeoutMills < 0) {
+                return rpcClientInner.request(request);
+            }
             return rpcClientInner.request(request, timeoutMills);
         }
 

diff --git a/client/src/test/java/com/alibaba/nacos/client/config/impl/ClientWorkerTest.java b/client/src/test/java/com/alibaba/nacos/client/config/impl/ClientWorkerTest.java
@@ -232,7 +232,7 @@ void testPublishConfigSuccess() throws NacosException {
         String casMd5 = "1111";
 
         String type = "properties";
-        Mockito.when(rpcClient.request(any(ConfigPublishRequest.class), anyLong()))
+        Mockito.when(rpcClient.request(any(ConfigPublishRequest.class)))
                 .thenReturn(new ConfigPublishResponse());
         boolean b = clientWorker.publishConfig(dataId, group, tenant, appName, tag, betaIps, content, null, casMd5,
                 type);
@@ -261,7 +261,7 @@ void testPublishConfigFail() throws NacosException {
         String casMd5 = "1111";
 
         String type = "properties";
-        Mockito.when(rpcClient.request(any(ConfigPublishRequest.class), anyLong()))
+        Mockito.when(rpcClient.request(any(ConfigPublishRequest.class)))
                 .thenReturn(ConfigPublishResponse.buildFailResponse(503, "over limit"));
         boolean b = clientWorker.publishConfig(dataId, group, tenant, appName, tag, betaIps, content, null, casMd5,
                 type);
@@ -290,7 +290,7 @@ void testPublishConfigException() throws NacosException {
         String casMd5 = "1111";
 
         String type = "properties";
-        Mockito.when(rpcClient.request(any(ConfigPublishRequest.class), anyLong())).thenThrow(new NacosException());
+        Mockito.when(rpcClient.request(any(ConfigPublishRequest.class))).thenThrow(new NacosException());
         boolean b = clientWorker.publishConfig(dataId, group, tenant, appName, tag, betaIps, content, null, casMd5,
                 type);
         assertFalse(b);
@@ -313,7 +313,7 @@ void testRemoveConfig() throws NacosException {
 
         String tag = "tag";
         try {
-            Mockito.when(rpcClient.request(any(ConfigRemoveRequest.class), anyLong()))
+            Mockito.when(rpcClient.request(any(ConfigRemoveRequest.class)))
                     .thenThrow(new NacosException(503, "overlimit"));
 
             clientWorker.removeConfig(dataId, group, tenant, tag);
@@ -562,13 +562,13 @@ public void receiveConfigInfo(String configInfo) {
                 () -> RpcClientFactory.createClient(anyString(), any(ConnectionType.class), any(Map.class),
                         any(RpcClientTlsConfig.class))).thenReturn(rpcClientInner);
         // mock listen and remove listen request
-        Mockito.when(rpcClientInner.request(any(ConfigBatchListenRequest.class), anyLong()))
+        Mockito.when(rpcClientInner.request(any(ConfigBatchListenRequest.class)))
                 .thenReturn(response, response);
         // mock query changed config
         ConfigQueryResponse configQueryResponse = new ConfigQueryResponse();
         configQueryResponse.setContent("content" + System.currentTimeMillis());
         configQueryResponse.setContentType(ConfigType.JSON.getType());
-        Mockito.when(rpcClientInner.request(any(ConfigQueryRequest.class), anyLong())).thenReturn(configQueryResponse);
+        Mockito.when(rpcClientInner.request(any(ConfigQueryRequest.class))).thenReturn(configQueryResponse);
         (clientWorker.getAgent()).executeConfigListen();
         //assert
         //use local cache.

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/constant/ConfigModuleStateBuilder.java b/config/src/main/java/com/alibaba/nacos/config/server/constant/ConfigModuleStateBuilder.java
@@ -50,7 +50,8 @@ public ModuleState build() {
         moduleState.newState(PropertiesConstant.DEFAULT_MAX_SIZE, PropertyUtil.getDefaultMaxSize());
         moduleState.newState(PropertiesConstant.DEFAULT_MAX_AGGR_COUNT, PropertyUtil.getDefaultMaxAggrCount());
         moduleState.newState(PropertiesConstant.DEFAULT_MAX_AGGR_SIZE, PropertyUtil.getDefaultMaxAggrSize());
-
+        moduleState.newState(Constants.CONFIG_RENTENTION_DAYS_PROPERTY_STATE, PropertyUtil.getConfigRententionDays());
+
         return moduleState;
     }
 }
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java b/config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java
@@ -33,7 +33,9 @@ public class Constants {
     public static final String DEFAULT_GROUP = "DEFAULT_GROUP";
 
     public static final String DATASOURCE_PLATFORM_PROPERTY_STATE = "datasource_platform";
-
+
+    public static final String CONFIG_RENTENTION_DAYS_PROPERTY_STATE = "config_retention_days";
+
     /**
      * Config file directory in server side.
      */

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/constant/PropertiesConstant.java b/config/src/main/java/com/alibaba/nacos/config/server/constant/PropertiesConstant.java
@@ -62,6 +62,7 @@ public class PropertiesConstant {
     public static final String DUMP_CHANGE_ON = "dumpChangeOn";
 
     public static final String DUMP_CHANGE_WORKER_INTERVAL = "dumpChangeWorkerInterval";
-
-
+
+    public static final String CONFIG_RENTENTION_DAYS = "nacos.config.retention.days";
+
 }
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ClientMetricsController.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ClientMetricsController.java
@@ -18,6 +18,7 @@
 
 import com.alibaba.nacos.api.config.remote.request.ClientConfigMetricRequest;
 import com.alibaba.nacos.api.config.remote.response.ClientConfigMetricResponse;
+import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.auth.annotation.Secured;
 import com.alibaba.nacos.common.http.Callback;
 import com.alibaba.nacos.common.http.HttpClientBeanHolder;
@@ -30,6 +31,7 @@
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.paramcheck.ConfigDefaultHttpParamExtractor;
 import com.alibaba.nacos.config.server.utils.GroupKey2;
+import com.alibaba.nacos.config.server.utils.ParamUtils;
 import com.alibaba.nacos.core.cluster.Member;
 import com.alibaba.nacos.core.cluster.ServerMemberManager;
 import com.alibaba.nacos.core.paramcheck.ExtractorManager;
@@ -86,7 +88,11 @@ public ClientMetricsController(ServerMemberManager serverMemberManager, Connecti
     public ResponseEntity metric(@RequestParam("ip") String ip,
             @RequestParam(value = "dataId", required = false) String dataId,
             @RequestParam(value = "group", required = false) String group,
-            @RequestParam(value = "tenant", required = false) String tenant) {
+            @RequestParam(value = "tenant", required = false) String tenant) throws NacosException {
+
+        ParamUtils.checkTenant(tenant);
+        ParamUtils.checkParam(dataId, group, "default", "default");
+
         Loggers.CORE.info("Get cluster config metrics received, ip={},dataId={},group={},tenant={}", ip, dataId, group,
                 tenant);
         Map<String, Object> responseMap = new HashMap<>(3);
@@ -168,7 +174,11 @@ public void onCancel() {
     public Map<String, Object> getClientMetrics(@RequestParam("ip") String ip,
             @RequestParam(value = "dataId", required = false) String dataId,
             @RequestParam(value = "group", required = false) String group,
-            @RequestParam(value = "tenant", required = false) String tenant) {
+            @RequestParam(value = "tenant", required = false) String tenant) throws NacosException {
+
+        ParamUtils.checkTenant(tenant);
+        ParamUtils.checkParam(dataId, group, "default", "default");
+
         Map<String, Object> metrics = new HashMap<>(16);
         List<Connection> connectionsByIp = connectionManager.getConnectionByIp(ip);
         for (Connection connectionByIp : connectionsByIp) {

diff --git a/...in/java/com/alibaba/nacos/config/server/remote/ConfigChangeClusterSyncRequestHandler.java b/...in/java/com/alibaba/nacos/config/server/remote/ConfigChangeClusterSyncRequestHandler.java
@@ -19,6 +19,7 @@
 import com.alibaba.nacos.api.config.remote.request.cluster.ConfigChangeClusterSyncRequest;
 import com.alibaba.nacos.api.config.remote.response.cluster.ConfigChangeClusterSyncResponse;
 import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.remote.RemoteConstants;
 import com.alibaba.nacos.api.remote.request.RequestMeta;
 import com.alibaba.nacos.config.server.service.dump.DumpRequest;
 import com.alibaba.nacos.config.server.service.dump.DumpService;
@@ -27,6 +28,7 @@
 import com.alibaba.nacos.core.paramcheck.impl.ConfigRequestParamExtractor;
 import com.alibaba.nacos.core.remote.RequestHandler;
 import com.alibaba.nacos.core.control.TpsControl;
+import com.alibaba.nacos.core.remote.grpc.InvokeSource;
 import org.springframework.stereotype.Component;
 
 /**
@@ -36,6 +38,7 @@
  * @version $Id: ConfigChangeClusterSyncRequestHandler.java, v 0.1 2020年08月11日 4:35 PM liuzunfei Exp $
  */
 @Component
+@InvokeSource(source = {RemoteConstants.LABEL_SOURCE_CLUSTER})
 public class ConfigChangeClusterSyncRequestHandler
         extends RequestHandler<ConfigChangeClusterSyncRequest, ConfigChangeClusterSyncResponse> {
 

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/NamespaceConfigInfoService.java
@@ -16,12 +16,11 @@
 
 package com.alibaba.nacos.config.server.service;
 
-import com.alibaba.nacos.config.server.model.capacity.TenantCapacity;
-import com.alibaba.nacos.config.server.service.capacity.TenantCapacityPersistService;
+import com.alibaba.nacos.config.server.constant.PropertiesConstant;
 import com.alibaba.nacos.config.server.service.repository.ConfigInfoPersistService;
-import com.alibaba.nacos.config.server.utils.PropertyUtil;
 import com.alibaba.nacos.core.namespace.injector.AbstractNamespaceDetailInjector;
 import com.alibaba.nacos.core.namespace.model.Namespace;
+import com.alibaba.nacos.sys.env.EnvUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -34,23 +33,17 @@ public class NamespaceConfigInfoService extends AbstractNamespaceDetailInjector
 
     private final ConfigInfoPersistService configInfoPersistService;
 
-    private final TenantCapacityPersistService tenantCapacityPersistService;
-
-    public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService,
-            TenantCapacityPersistService tenantCapacityPersistService) {
+    public NamespaceConfigInfoService(ConfigInfoPersistService configInfoPersistService) {
         this.configInfoPersistService = configInfoPersistService;
-        this.tenantCapacityPersistService = tenantCapacityPersistService;
     }
 
     @Override
     public void injectDetail(Namespace namespace) {
-        // set tenant quota
-        TenantCapacity tenantCapacity = tenantCapacityPersistService.getTenantCapacity(namespace.getNamespace());
-        if (tenantCapacity != null && tenantCapacity.getQuota() != null && tenantCapacity.getQuota() > 0) {
-            namespace.setQuota(tenantCapacity.getQuota());
-        } else {
-            namespace.setQuota(PropertyUtil.getDefaultTenantQuota());
+
+        if (EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class) != null) {
+            namespace.setQuota(EnvUtil.getProperty(PropertiesConstant.DEFAULT_TENANT_QUOTA, Integer.class));
         }
+
         // set config count.
         int configCount = configInfoPersistService.configInfoCount(namespace.getNamespace());
         namespace.setConfigCount(configCount);

diff --git a/...c/main/java/com/alibaba/nacos/config/server/service/dump/DefaultHistoryConfigCleaner.java b/...c/main/java/com/alibaba/nacos/config/server/service/dump/DefaultHistoryConfigCleaner.java
@@ -17,8 +17,8 @@
 package com.alibaba.nacos.config.server.service.dump;
 
 import com.alibaba.nacos.config.server.service.repository.HistoryConfigInfoPersistService;
+import com.alibaba.nacos.config.server.utils.PropertyUtil;
 import com.alibaba.nacos.config.server.utils.TimeUtils;
-import com.alibaba.nacos.sys.env.EnvUtil;
 import com.alibaba.nacos.sys.utils.ApplicationUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +27,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import static com.alibaba.nacos.config.server.utils.LogUtil.FATAL_LOG;
-
 /**
  * The type Default history config cleaner.
  *
@@ -40,8 +38,6 @@ public class DefaultHistoryConfigCleaner implements HistoryConfigCleaner {
 
     private HistoryConfigInfoPersistService historyConfigInfoPersistService;
 
-    private int retentionDays = 30;
-
     @Override
     public void cleanHistoryConfig() {
         Timestamp startTime = getBeforeStamp(TimeUtils.getCurrentTime(), 24 * getRetentionDays());
@@ -66,22 +62,7 @@ private Timestamp getBeforeStamp(Timestamp date, int step) {
     }
 
     private int getRetentionDays() {
-        String val = EnvUtil.getProperty("nacos.config.retention.days");
-        if (null == val) {
-            return retentionDays;
-        }
-
-        int tmp = 0;
-        try {
-            tmp = Integer.parseInt(val);
-            if (tmp > 0) {
-                retentionDays = tmp;
-            }
-        } catch (NumberFormatException nfe) {
-            FATAL_LOG.error("read nacos.config.retention.days wrong", nfe);
-        }
-
-        return retentionDays;
+        return PropertyUtil.getConfigRententionDays();
     }
 
     @Override

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/PropertyUtil.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/PropertyUtil.java
@@ -29,6 +29,8 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static com.alibaba.nacos.config.server.utils.LogUtil.FATAL_LOG;
+
 /**
  * Properties util.
  *
@@ -100,7 +102,12 @@ public class PropertyUtil implements ApplicationContextInitializer<ConfigurableA
     private static int correctUsageDelay = 10 * 60;
 
     private static boolean dumpChangeOn = true;
-
+
+    /**
+     * The number of days to retain the configuration history, the default is 30 days.
+     */
+    private static int configRententionDays = 30;
+
     /**
      * dumpChangeWorkerInterval, default 30 seconds.
      */
@@ -241,7 +248,26 @@ public static int getCorrectUsageDelay() {
     public static void setCorrectUsageDelay(int correctUsageDelay) {
         PropertyUtil.correctUsageDelay = correctUsageDelay;
     }
-
+
+    public static int getConfigRententionDays() {
+        return configRententionDays;
+    }
+
+    private void setConfigRententionDays() {
+        String val =  getProperty(PropertiesConstant.CONFIG_RENTENTION_DAYS);
+        if (null != val) {
+            int tmp = 0;
+            try {
+                tmp = Integer.parseInt(val);
+                if (tmp > 0) {
+                    PropertyUtil.configRententionDays = tmp;
+                }
+            } catch (NumberFormatException nfe) {
+                FATAL_LOG.error("read nacos.config.retention.days wrong", nfe);
+            }
+        }
+    }
+
     public static boolean isStandaloneMode() {
         return EnvUtil.getStandaloneMode();
     }
@@ -275,6 +301,7 @@ private void loadSetting() {
             setDefaultMaxAggrSize(getInt(PropertiesConstant.DEFAULT_MAX_AGGR_SIZE, defaultMaxAggrSize));
             setCorrectUsageDelay(getInt(PropertiesConstant.CORRECT_USAGE_DELAY, correctUsageDelay));
             setInitialExpansionPercent(getInt(PropertiesConstant.INITIAL_EXPANSION_PERCENT, initialExpansionPercent));
+            setConfigRententionDays();
             setDumpChangeOn(getBoolean(PropertiesConstant.DUMP_CHANGE_ON, dumpChangeOn));
             setDumpChangeWorkerInterval(
                     getLong(PropertiesConstant.DUMP_CHANGE_WORKER_INTERVAL, dumpChangeWorkerInterval));