Merge pull request #1 from alibaba/develop

更新代码
KeRan213539 · Sep 21, 2020 · 167d479 · 167d479
2 parents 37bb909 + 7fd4d9a
commit 167d479
Show file tree

Hide file tree

Showing 153 changed files with 2,055 additions and 1,496 deletions.
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/utils/NamingUtils.java b/api/src/main/java/com/alibaba/nacos/api/naming/utils/NamingUtils.java
@@ -28,6 +28,9 @@
 public class NamingUtils {
 
     public static String getGroupedName(final String serviceName, final String groupName) {
+        if (StringUtils.isBlank(serviceName)) {
+            throw new IllegalArgumentException("Param 'serviceName' is illegal, serviceName is blank");
+        }
         final String resultGroupedName = groupName + Constants.SERVICE_INFO_SPLITER + serviceName;
         return resultGroupedName.intern();
     }

diff --git a/auth/pom.xml b/auth/pom.xml
@@ -40,6 +40,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>nacos-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-sys</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java b/auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java
@@ -16,12 +16,11 @@
 
 package com.alibaba.nacos.auth.common;
 
-import com.alibaba.nacos.auth.common.env.ReloadableConfigs;
 import com.alibaba.nacos.common.JustForTest;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
 import io.jsonwebtoken.io.Decoders;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -40,9 +39,6 @@ public class AuthConfigs {
     @JustForTest
     private static Boolean cachingEnabled = null;
 
-    @Autowired
-    private ReloadableConfigs reloadableConfigs;
-
     /**
      * secret key.
      */
@@ -93,7 +89,7 @@ public boolean isAuthEnabled() {
             return BooleanUtils.toBoolean(enabled);
         }
         return BooleanUtils
-                .toBoolean(reloadableConfigs.getProperties().getProperty("nacos.core.auth.enabled", "false"));
+                .toBoolean(ApplicationUtils.getProperty("nacos.core.auth.enabled", "false"));
     }
 
     /**
@@ -106,7 +102,7 @@ public boolean isCachingEnabled() {
             return cachingEnabled;
         }
         return BooleanUtils
-                .toBoolean(reloadableConfigs.getProperties().getProperty("nacos.core.auth.caching.enabled", "true"));
+                .toBoolean(ApplicationUtils.getProperty("nacos.core.auth.caching.enabled", "true"));
     }
 
     @JustForTest

diff --git a/auth/src/main/java/com/alibaba/nacos/auth/common/env/ReloadableConfigs.java b/auth/src/main/java/com/alibaba/nacos/auth/common/env/ReloadableConfigs.java
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
@@ -32,7 +32,6 @@
 import com.alibaba.nacos.client.utils.TenantUtil;
 import com.alibaba.nacos.common.http.HttpRestResult;
 import com.alibaba.nacos.common.lifecycle.Closeable;
-import com.alibaba.nacos.common.utils.ConcurrentHashSet;
 import com.alibaba.nacos.common.utils.ConvertUtils;
 import com.alibaba.nacos.common.utils.MD5Utils;
 import com.alibaba.nacos.common.utils.StringUtils;
@@ -166,7 +165,6 @@ private void removeCache(String dataId, String group) {
             copy.remove(groupKey);
             cacheMap.set(copy);
         }
-        reMakeCacheDataTaskId();
         LOGGER.info("[{}] [unsubscribe] {}", this.agent.getName(), groupKey);
 
         MetricsMonitor.getListenConfigCountMonitor().set(cacheMap.get().size());
@@ -179,38 +177,11 @@ void removeCache(String dataId, String group, String tenant) {
             copy.remove(groupKey);
             cacheMap.set(copy);
         }
-        reMakeCacheDataTaskId();
         LOGGER.info("[{}] [unsubscribe] {}", agent.getName(), groupKey);
 
         MetricsMonitor.getListenConfigCountMonitor().set(cacheMap.get().size());
     }
 
-    /**
-     * Remake cacheData taskId.
-     */
-    private void reMakeCacheDataTaskId() {
-        int listenerSize = cacheMap.get().size();
-        int remakeTaskId = (int) Math.ceil(listenerSize / ParamUtil.getPerTaskConfigSize());
-        if (remakeTaskId < (int) currentLongingTaskCount) {
-            for (int i = 0; i < remakeTaskId; i++) {
-                int count = 0;
-                for (String key : cacheMap.get().keySet()) {
-                    if (count == ParamUtil.getPerTaskConfigSize()) {
-                        break;
-                    }
-                    CacheData cacheData = cacheMap.get().get(key);
-                    cacheData.setTaskId(i);
-                    synchronized (cacheMap) {
-                        Map<String, CacheData> copy = new HashMap<String, CacheData>(this.cacheMap.get());
-                        copy.put(key, cacheData);
-                        cacheMap.set(copy);
-                    }
-                    count++;
-                }
-            }
-        }
-    }
-
     /**
      * Add cache data if absent.
      *
@@ -277,8 +248,6 @@ public CacheData addCacheDataIfAbsent(String dataId, String group, String tenant
                 cache.setInitializing(true);
             } else {
                 cache = new CacheData(configFilterChainManager, agent.getName(), dataId, group, tenant);
-                int taskId = cacheMap.get().size() / (int) ParamUtil.getPerTaskConfigSize();
-                cache.setTaskId(taskId);
                 // fix issue # 1317
                 if (enableRemoteSyncConfig) {
                     String[] ct = getServerConfig(dataId, group, tenant, 3000L);
@@ -425,16 +394,11 @@ public void checkConfigInfo() {
         int longingTaskCount = (int) Math.ceil(listenerSize / ParamUtil.getPerTaskConfigSize());
         if (longingTaskCount > currentLongingTaskCount) {
             for (int i = (int) currentLongingTaskCount; i < longingTaskCount; i++) {
-                taskIdSet.add(i);
                 // The task list is no order.So it maybe has issues when changing.
                 executorService.execute(new LongPollingRunnable(i));
             }
-        } else if (longingTaskCount < currentLongingTaskCount) {
-            for (int i = longingTaskCount; i < (int) currentLongingTaskCount; i++) {
-                taskIdSet.remove(i);
-            }
+            currentLongingTaskCount = longingTaskCount;
         }
-        currentLongingTaskCount = longingTaskCount;
     }
 
     /**
@@ -692,9 +656,7 @@ public void run() {
                 }
                 inInitializingCacheList.clear();
 
-                if (taskIdSet.contains(taskId)) {
-                    executorService.execute(this);
-                }
+                executorService.execute(this);
 
             } catch (Throwable e) {
 
@@ -723,11 +685,6 @@ private void setHealthServer(boolean isHealthServer) {
     private final AtomicReference<Map<String, CacheData>> cacheMap = new AtomicReference<Map<String, CacheData>>(
             new HashMap<String, CacheData>());
 
-    /**
-     * Store the running taskId.
-     */
-    private final ConcurrentHashSet<Integer> taskIdSet = new ConcurrentHashSet<Integer>();
-
     private final HttpAgent agent;
 
     private final ConfigFilterChainManager configFilterChainManager;

diff --git a/client/src/test/java/com/alibaba/nacos/client/config/listener/impl/ClientWorkerTest.java b/client/src/test/java/com/alibaba/nacos/client/config/listener/impl/ClientWorkerTest.java
diff --git a/common/src/main/java/com/alibaba/nacos/common/http/AbstractApacheHttpClientFactory.java b/common/src/main/java/com/alibaba/nacos/common/http/AbstractApacheHttpClientFactory.java
@@ -30,9 +30,15 @@ public abstract class AbstractApacheHttpClientFactory extends AbstractHttpClient
 
     @Override
     public final NacosRestTemplate createNacosRestTemplate() {
+        final HttpClientConfig originalRequestConfig = buildHttpClientConfig();
         final RequestConfig requestConfig = getRequestConfig();
-        return new NacosRestTemplate(assignLogger(),
-                new DefaultHttpClientRequest(HttpClients.custom().setDefaultRequestConfig(requestConfig).build()));
+        return new NacosRestTemplate(assignLogger(), new DefaultHttpClientRequest(
+                HttpClients.custom().setDefaultRequestConfig(requestConfig)
+                        .setUserAgent(originalRequestConfig.getUserAgent())
+                        .setMaxConnTotal(originalRequestConfig.getMaxConnTotal())
+                        .setMaxConnPerRoute(originalRequestConfig.getMaxConnPerRoute())
+                        .setConnectionTimeToLive(originalRequestConfig.getConnTimeToLive(),
+                                originalRequestConfig.getConnTimeToLiveTimeUnit()).build()));
     }
 
 }