getInstanceList() {
return instanceList;
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
index 7addc5875b4..170a8ded7f9 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
@@ -18,8 +18,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.nacos.naming.boot.SpringContext;
-import com.alibaba.nacos.naming.consistency.RecordListener;
import com.alibaba.nacos.naming.consistency.KeyBuilder;
+import com.alibaba.nacos.naming.consistency.RecordListener;
import com.alibaba.nacos.naming.healthcheck.ClientBeatCheckTask;
import com.alibaba.nacos.naming.healthcheck.ClientBeatProcessor;
import com.alibaba.nacos.naming.healthcheck.HealthCheckReactor;
@@ -44,9 +44,9 @@
* Service of Nacos server side
*
* We introduce a 'service --> cluster --> instance' model, in which service stores a list of clusters,
- * which contains a list of instances.
+ * which contain a list of instances.
*
- * This class inherits from Service in API module and stores some fields that do not expose to client.
+ * This class inherits from Service in API module and stores some fields that do not have to expose to client.
*
* @author nkorange
*/
@@ -154,14 +154,19 @@ public void onChange(String key, Instances value) throws Exception {
Loggers.SRV_LOG.info("[NACOS-RAFT] datum is changed, key: {}, value: {}", key, value);
- for (Instance ip : value.getInstanceList()) {
+ for (Instance instance : value.getInstanceList()) {
+
+ if (instance == null) {
+ // Reject this abnormal instance list:
+ throw new RuntimeException("got null instance " + key);
+ }
- if (ip.getWeight() > 10000.0D) {
- ip.setWeight(10000.0D);
+ if (instance.getWeight() > 10000.0D) {
+ instance.setWeight(10000.0D);
}
- if (ip.getWeight() < 0.01D && ip.getWeight() > 0.0D) {
- ip.setWeight(0.01D);
+ if (instance.getWeight() < 0.01D && instance.getWeight() > 0.0D) {
+ instance.setWeight(0.01D);
}
}
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java b/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
index b5c34ea1ffb..46600847378 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
@@ -21,7 +21,6 @@
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.naming.cluster.ServerListManager;
-import com.alibaba.nacos.naming.cluster.ServerMode;
import com.alibaba.nacos.naming.cluster.servers.Server;
import com.alibaba.nacos.naming.consistency.ConsistencyService;
import com.alibaba.nacos.naming.consistency.Datum;
@@ -79,6 +78,8 @@ public class ServiceManager implements RecordListener {
@Autowired
private PushService pushService;
+ private final Object putServiceLock = new Object();
+
@PostConstruct
public void init() {
@@ -155,9 +156,15 @@ public void onChange(String key, Service service) throws Exception {
public void onDelete(String key) throws Exception {
String namespace = KeyBuilder.getNamespace(key);
String name = KeyBuilder.getServiceName(key);
- Service service = chooseServiceMap(namespace).remove(name);
+ Service service = chooseServiceMap(namespace).get(name);
Loggers.RAFT.info("[RAFT-NOTIFIER] datum is deleted, key: {}", key);
+ // check again:
+ if (service != null && !service.allIPs().isEmpty()) {
+ Loggers.SRV_LOG.warn("service not empty, key: {}", key);
+ return;
+ }
+
if (service != null) {
service.destroy();
consistencyService.remove(KeyBuilder.buildInstanceListKey(namespace, name, true));
@@ -165,6 +172,8 @@ public void onDelete(String key) throws Exception {
consistencyService.unlisten(KeyBuilder.buildServiceMetaKey(namespace, name), service);
Loggers.SRV_LOG.info("[DEAD-SERVICE] {}", service.toJSON());
}
+
+ chooseServiceMap(namespace).remove(name);
}
private class UpdatedServiceProcessor implements Runnable {
@@ -321,16 +330,28 @@ public int getResponsibleInstanceCount() {
}
public void easyRemoveService(String namespaceId, String serviceName) throws Exception {
+
+ Service service = getService(namespaceId, serviceName);
+ if (service == null) {
+ throw new IllegalArgumentException("specified service not exist, serviceName : " + serviceName);
+ }
+
+ if (!service.allIPs().isEmpty()) {
+ throw new IllegalArgumentException("specified service has instances, serviceName : " + serviceName);
+ }
+
consistencyService.remove(KeyBuilder.buildServiceMetaKey(namespaceId, serviceName));
}
- public void addOrReplaceService(Service service) throws Exception {
+ public void addOrReplaceService(Service service) throws NacosException {
consistencyService.put(KeyBuilder.buildServiceMetaKey(service.getNamespaceId(), service.getName()), service);
}
- public void createEmptyService(String namespaceId, String serviceName) throws NacosException {
+ public void createEmptyService(String namespaceId, String serviceName, boolean local) throws NacosException {
Service service = getService(namespaceId, serviceName);
if (service == null) {
+
+ Loggers.SRV_LOG.info("creating empty service {}:{}", namespaceId, serviceName);
service = new Service();
service.setName(serviceName);
service.setNamespaceId(namespaceId);
@@ -339,10 +360,14 @@ public void createEmptyService(String namespaceId, String serviceName) throws Na
service.setLastModifiedMillis(System.currentTimeMillis());
service.recalculateChecksum();
service.validate();
- putService(service);
- service.init();
- consistencyService.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), true), service);
- consistencyService.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), false), service);
+ if (local) {
+ putService(service);
+ service.init();
+ consistencyService.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), true), service);
+ consistencyService.listen(KeyBuilder.buildInstanceListKey(service.getNamespaceId(), service.getName(), false), service);
+ } else {
+ addOrReplaceService(service);
+ }
}
}
@@ -358,9 +383,7 @@ public void createEmptyService(String namespaceId, String serviceName) throws Na
*/
public void registerInstance(String namespaceId, String serviceName, Instance instance) throws NacosException {
- if (ServerMode.AP.name().equals(switchDomain.getServerMode())) {
- createEmptyService(namespaceId, serviceName);
- }
+ createEmptyService(namespaceId, serviceName, instance.isEphemeral());
Service service = getService(namespaceId, serviceName);
@@ -466,6 +489,7 @@ public List updateIpAddresses(Service service, String action, boolean
if (!service.getClusterMap().containsKey(instance.getClusterName())) {
Cluster cluster = new Cluster(instance.getClusterName());
cluster.setService(service);
+ cluster.init();
service.getClusterMap().put(instance.getClusterName(), cluster);
Loggers.SRV_LOG.warn("cluster: {} not found, ip: {}, will create new cluster with default configuration.",
instance.getClusterName(), instance.toJSON());
@@ -522,7 +546,11 @@ public boolean containService(String namespaceId, String serviceName) {
public void putService(Service service) {
if (!serviceMap.containsKey(service.getNamespaceId())) {
- serviceMap.put(service.getNamespaceId(), new ConcurrentHashMap<>(16));
+ synchronized (putServiceLock) {
+ if (!serviceMap.containsKey(service.getNamespaceId())) {
+ serviceMap.put(service.getNamespaceId(), new ConcurrentHashMap<>(16));
+ }
+ }
}
serviceMap.get(service.getNamespaceId()).put(service.getName(), service);
}
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
index dc54484b24d..bad71625fc8 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
@@ -27,6 +27,8 @@
import org.apache.http.*;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ContentType;
@@ -41,6 +43,7 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
+import java.net.URI;
import java.net.URL;
import java.net.URLEncoder;
import java.util.*;
@@ -285,6 +288,29 @@ public static void asyncHttpPutLarge(String url, Map headers, by
}
}
+ public static void asyncHttpGetLarge(String url, Map headers, byte[] content, AsyncCompletionHandler handler) throws Exception {
+ AsyncHttpClient.BoundRequestBuilder builder = asyncHttpClient.prepareGet(url);
+
+ if (!headers.isEmpty()) {
+ for (String headerKey : headers.keySet()) {
+ builder.setHeader(headerKey, headers.get(headerKey));
+ }
+ }
+
+ builder.setBody(content);
+
+ builder.setHeader("Content-Type", "application/json; charset=UTF-8");
+ builder.setHeader("Accept-Charset", "UTF-8");
+ builder.setHeader("Accept-Encoding", "gzip");
+ builder.setHeader("Content-Encoding", "gzip");
+
+ if (handler != null) {
+ builder.execute(handler);
+ } else {
+ builder.execute();
+ }
+ }
+
public static HttpResult httpPutLarge(String url, Map headers, byte[] content) {
try {
HttpClientBuilder builder = HttpClients.custom();
@@ -313,6 +339,35 @@ public static HttpResult httpPutLarge(String url, Map headers, b
}
}
+ public static HttpResult httpGetLarge(String url, Map headers, String content) {
+
+ try {
+ HttpClientBuilder builder = HttpClients.custom();
+ builder.setUserAgent(UtilsAndCommons.SERVER_VERSION);
+ builder.setConnectionTimeToLive(500, TimeUnit.MILLISECONDS);
+
+ CloseableHttpClient httpClient = builder.build();
+ HttpGetWithEntity httpGetWithEntity = new HttpGetWithEntity();
+ httpGetWithEntity.setURI(new URI(url));
+
+ for (Map.Entry entry : headers.entrySet()) {
+ httpGetWithEntity.setHeader(entry.getKey(), entry.getValue());
+ }
+
+ httpGetWithEntity.setEntity(new StringEntity(content, ContentType.create("application/json", "UTF-8")));
+ HttpResponse response = httpClient.execute(httpGetWithEntity);
+ HttpEntity entity = response.getEntity();
+
+ HeaderElement[] headerElements = entity.getContentType().getElements();
+ String charset = headerElements[0].getParameterByName("charset").getValue();
+
+ return new HttpResult(response.getStatusLine().getStatusCode(),
+ IOUtils.toString(entity.getContent(), charset), Collections.emptyMap());
+ } catch (Exception e) {
+ return new HttpResult(500, e.toString(), Collections.emptyMap());
+ }
+ }
+
public static HttpResult httpPostLarge(String url, Map headers, String content) {
try {
HttpClientBuilder builder = HttpClients.custom();
@@ -442,4 +497,14 @@ public String getHeader(String name) {
return respHeaders.get(name);
}
}
+
+ public static class HttpGetWithEntity extends HttpEntityEnclosingRequestBase {
+
+ public final static String METHOD_NAME = "GET";
+
+ @Override
+ public String getMethod() {
+ return METHOD_NAME;
+ }
+ }
}
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
index 9903967a211..bf3220f7e22 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
@@ -79,8 +79,8 @@ public static byte[] getData(List keys, String server) throws Exception
Map params = new HashMap<>(8);
params.put("keys", StringUtils.join(keys, ","));
- HttpClient.HttpResult result = HttpClient.httpGet("http://" + server + RunningConfig.getContextPath()
- + UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_GET_URL, new ArrayList<>(), params);
+ HttpClient.HttpResult result = HttpClient.httpGetLarge("http://" + server + RunningConfig.getContextPath()
+ + UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_GET_URL, new HashMap<>(8), JSON.toJSONString(params));
if (HttpURLConnection.HTTP_OK == result.code) {
return result.content.getBytes();
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/ServiceStatusSynchronizer.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/ServiceStatusSynchronizer.java
index 4cfa285fcc4..8c6ddc8c9b1 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/ServiceStatusSynchronizer.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/ServiceStatusSynchronizer.java
@@ -15,6 +15,7 @@
*/
package com.alibaba.nacos.naming.misc;
+import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.naming.boot.RunningConfig;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
@@ -49,7 +50,7 @@ public void send(final String serverIP, Message msg) {
}
try {
- HttpClient.asyncHttpPost(url, null, params, new AsyncCompletionHandler() {
+ HttpClient.asyncHttpPostLarge(url, null, JSON.toJSONString(params), new AsyncCompletionHandler() {
@Override
public Integer onCompleted(Response response) throws Exception {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) {
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
index 68b1b162db8..51c0c5dd69b 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
@@ -89,7 +89,7 @@ public class SwitchDomain implements Record, Cloneable {
private String overriddenServerStatus = null;
- private String serverMode = "AP";
+ private boolean defaultInstanceEphemeral = true;
public boolean isEnableAuthentication() {
return enableAuthentication;
@@ -342,12 +342,12 @@ public void setOverriddenServerStatus(String overriddenServerStatus) {
this.overriddenServerStatus = overriddenServerStatus;
}
- public String getServerMode() {
- return serverMode;
+ public boolean isDefaultInstanceEphemeral() {
+ return defaultInstanceEphemeral;
}
- public void setServerMode(String serverMode) {
- this.serverMode = serverMode;
+ public void setDefaultInstanceEphemeral(boolean defaultInstanceEphemeral) {
+ this.defaultInstanceEphemeral = defaultInstanceEphemeral;
}
@Override
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java
index d9d16e9ffb8..f48a44f8a07 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java
@@ -59,5 +59,5 @@ public class SwitchEntry {
public static final String PARAM_JSON = "json";
public static final String OVERRIDDEN_SERVER_STATUS = "overriddenServerStatus";
- public static final String SERVER_MODE = "serverMode";
+ public static final String DEFAULT_INSTANCE_EPHEMERAL = "defaultInstanceEphemeral";
}
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchManager.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchManager.java
index a4df47f1f7c..e34192c568c 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchManager.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchManager.java
@@ -18,7 +18,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.naming.cluster.ServerMode;
import com.alibaba.nacos.naming.consistency.ConsistencyService;
import com.alibaba.nacos.naming.consistency.Datum;
import com.alibaba.nacos.naming.consistency.KeyBuilder;
@@ -263,9 +262,9 @@ public void update(String entry, String value, boolean debug) throws Exception {
switchDomain.setOverriddenServerStatus(status);
}
- if (entry.equals(SwitchEntry.SERVER_MODE)) {
- String mode = value;
- switchDomain.setServerMode(ServerMode.valueOf(mode).name());
+ if (entry.equals(SwitchEntry.DEFAULT_INSTANCE_EPHEMERAL)) {
+ String defaultEphemeral = value;
+ switchDomain.setDefaultInstanceEphemeral(Boolean.parseBoolean(defaultEphemeral));
}
if (debug) {
@@ -308,7 +307,7 @@ public void update(SwitchDomain newSwitchDomain) {
switchDomain.setPushCVersion(newSwitchDomain.getPushCVersion());
switchDomain.setEnableAuthentication(newSwitchDomain.isEnableAuthentication());
switchDomain.setOverriddenServerStatus(newSwitchDomain.getOverriddenServerStatus());
- switchDomain.setServerMode(newSwitchDomain.getServerMode());
+ switchDomain.setDefaultInstanceEphemeral(newSwitchDomain.isDefaultInstanceEphemeral());
}
public SwitchDomain getSwitchDomain() {
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
index 0891ae2b4c3..d3c8a28040d 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
@@ -237,4 +237,34 @@ public static Map parseMetadata(String metadata) throws NacosExc
public static String assembleFullServiceName(String namespaceId, String serviceName) {
return namespaceId + UtilsAndCommons.NAMESPACE_SERVICE_CONNECTOR + serviceName;
}
+
+ /**
+ * 根据指定的字符串计算出一个0（含）到{@code upperLimit}（不含）之间的数字，本方法会试图让不同的字符串较均匀的分布在0到{@code upperLimit}之间。
+ * (Provide a number between 0(include) and {@code upperLimit}(exclude) for the given {@code string}, the number will be nearly uniform distribution.)
+ *
+ *
+ * 举个例子：假设有N个提供相同服务的服务器地址被存在一个数组中，为了实现负载均衡，可以根据调用者的名字决定使用哪个服务器。
+ * (e.g. Assume there's an array which contains some IP of the servers provide the same service, the caller name can be used to choose the server to achieve load balance.)
+ *
+ * String[] serverIps = new String[10];
+ * int index = shakeUp("callerName", serverIps.length);
+ * String targetServerIp = serverIps[index];
+ *
+ *
+ * @param string 字符串。如果为null会固定返回0 (a string. the number 0 will be returned if it's null)
+ * @param upperLimit 返回值的上限，必须为正整数(>0) (the upper limit of the returned number, must be a positive integer, which means > 0)
+ * @return 0（含）到upperLimit（不含）之间的一个数字 (a number between 0(include) and upperLimit(exclude))
+ * @throws IllegalArgumentException if the upper limit equals or less than 0
+ * @since 1.0.0
+ */
+ public static int shakeUp(String string, int upperLimit) {
+ if (upperLimit < 1) {
+ throw new IllegalArgumentException("upper limit must be greater than 0");
+ }
+ if (string == null) {
+ return 0;
+ }
+ return (string.hashCode() & Integer.MAX_VALUE) % upperLimit;
+ }
+
}
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java b/naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
index 485b9055fcd..bc650dd27f2 100644
--- a/naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
+++ b/naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
@@ -22,7 +22,6 @@
import com.alibaba.nacos.naming.misc.Loggers;
import com.alibaba.nacos.naming.misc.SwitchDomain;
import com.alibaba.nacos.naming.misc.UtilsAndCommons;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +56,6 @@ public void init(FilterConfig filterConfig) throws ServletException {
}
- @SuppressFBWarnings("HRS_REQUEST_PARAMETER_TO_HTTP_HEADER")
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest req = (HttpServletRequest) servletRequest;
@@ -68,6 +66,10 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
try {
String path = new URI(req.getRequestURI()).getPath();
String serviceName = req.getParameter(CommonParams.SERVICE_NAME);
+ // For client under 0.8.0:
+ if (StringUtils.isBlank(serviceName)) {
+ serviceName = req.getParameter("dom");
+ }
Method method = filterBase.getMethod(req.getMethod(), path);
if (method == null) {
diff --git a/naming/src/test/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/TaskDispatcherTest.java b/naming/src/test/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/TaskDispatcherTest.java
new file mode 100644
index 00000000000..6a67f943031
--- /dev/null
+++ b/naming/src/test/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/TaskDispatcherTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.naming.consistency.ephemeral.distro;
+
+import com.alibaba.nacos.naming.misc.GlobalConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+/**
+ * @author jifengnan
+ */
+public class TaskDispatcherTest {
+
+ private TaskDispatcher taskDispatcher;
+
+ @Before
+ public void init() {
+ taskDispatcher = new TaskDispatcher();
+ GlobalConfig conf = new GlobalConfig();
+ ReflectionTestUtils.setField(conf, "taskDispatchThreadCount", 3);
+ ReflectionTestUtils.setField(taskDispatcher, "partitionConfig", conf);
+ taskDispatcher.init();
+ }
+
+ @Test
+ public void testAddTask() {
+ char[] chars = new char[]{2325, 9, 30, 12, 2};
+ taskDispatcher.addTask(new String(chars));
+ }
+}
diff --git a/naming/src/test/java/com/alibaba/nacos/naming/misc/UtilsAndCommonsTest.java b/naming/src/test/java/com/alibaba/nacos/naming/misc/UtilsAndCommonsTest.java
index f206adedb45..009db7f1fd5 100644
--- a/naming/src/test/java/com/alibaba/nacos/naming/misc/UtilsAndCommonsTest.java
+++ b/naming/src/test/java/com/alibaba/nacos/naming/misc/UtilsAndCommonsTest.java
@@ -40,4 +40,16 @@ public void testControllerPathsDefaultValues() {
Assert.assertEquals("/nacos/v1/ns", DEFAULT_NACOS_NAMING_CONTEXT);
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testShakeUpException() {
+ UtilsAndCommons.shakeUp(null, 0);
+ }
+
+ @Test
+ public void testShakeUp() {
+ Assert.assertEquals(0, UtilsAndCommons.shakeUp(null, 1));
+ char[] chars = new char[]{2325, 9, 30, 12, 2};
+ Assert.assertEquals(0, UtilsAndCommons.shakeUp(new String(chars), 1));
+ }
}
diff --git a/pom.xml b/pom.xml
index 43601d94063..df49487d486 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
2018
com.alibaba.nacos
nacos-all
- 1.0.0-RC2
+ 1.0.0-RC3
pom
Alibaba NACOS ${project.version}
@@ -680,23 +680,22 @@