zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#502 Fix bug

Browse Source
This commit is contained in:
nkorange 2019-02-20 20:09:59 +08:00
parent 71af535efd
commit 918dcf9905
5 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
View File

@ -173,6 +173,7 @@ public class NamingProxy {
params.put("weight", String.valueOf(instance.getWeight()));
params.put("enable", String.valueOf(instance.isEnabled()));
params.put("healthy", String.valueOf(instance.isHealthy()));
params.put("ephemeral", String.valueOf(instance.isEphemeral()));
params.put("metadata", JSON.toJSONString(instance.getMetadata()));
reqAPI(UtilAndComs.NACOS_URL_INSTANCE, params, HttpMethod.POST);

7
naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/partition/PartitionConfig.java
View File

@ -39,6 +39,9 @@ public class PartitionConfig {
@Value("${nacos.naming.partition.syncRetryDelay}")
private long syncRetryDelay = 5000L;
@Value("${nacos.naming.partition.taskDispatchThreadCount}")
private int taskDispatchThreadCount = Runtime.getRuntime().availableProcessors();
public int getTaskDispatchPeriod() {
return taskDispatchPeriod;
}
@ -54,4 +57,8 @@ public class PartitionConfig {
public long getSyncRetryDelay() {
return syncRetryDelay;
}
public int getTaskDispatchThreadCount() {
return taskDispatchThreadCount;
}
}

3
naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/partition/PartitionConsistencyServiceImpl.java
View File

@ -130,7 +130,8 @@ public class PartitionConsistencyServiceImpl implements EphemeralConsistencyServ
if (isResponsible(entry.getKey())) {
// this key should not be sent from remote server:
Loggers.EPHEMERAL.error("receive responsible key timestamp of " + entry.getKey() + " from " + server);
continue;
// abort the procedure:
return;
}
if (!dataStore.contains(entry.getKey()) ||
dataStore.get(entry.getKey()).value == null ||

27
naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/partition/TaskDispatcher.java
View File

@ -25,8 +25,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.*;
/**
* Data sync task dispatcher
@ -37,28 +36,29 @@ import java.util.concurrent.LinkedBlockingQueue;
@Component
public class TaskDispatcher {
private List<BlockingQueue<String>> taskList = new ArrayList<>();
@Autowired
private PartitionConfig partitionConfig;
@Autowired
private DataSyncer dataSyncer;
private List<TaskScheduler> taskSchedulerList = new ArrayList<>();
@PostConstruct
public void init() {
for (int i = 0; i < Runtime.getRuntime().availableProcessors(); i++) {
taskList.add(new LinkedBlockingQueue<>(128 * 1024));
GlobalExecutor.submitTaskDispatch(new TaskScheduler(i));
for (int i = 0; i < partitionConfig.getTaskDispatchThreadCount(); i++) {
TaskScheduler taskScheduler = new TaskScheduler(i);
taskSchedulerList.add(taskScheduler);
GlobalExecutor.submitTaskDispatch(taskScheduler);
}
}
public int mapTask(String key) {
return Math.abs(key.hashCode() % Integer.MAX_VALUE) % Runtime.getRuntime().availableProcessors();
return Math.abs(key.hashCode()) % partitionConfig.getTaskDispatchThreadCount();
}
public void addTask(String key) {
taskList.get(mapTask(key)).add(key);
taskSchedulerList.get(mapTask(key)).addTask(key);
}
public class TaskScheduler implements Runnable {
@ -69,10 +69,16 @@ public class TaskDispatcher {
private long lastDispatchTime = 0L;
private BlockingQueue<String> queue = new LinkedBlockingQueue<>(128 * 1024);
public TaskScheduler(int index) {
this.index = index;
}
public void addTask(String key) {
queue.offer(key);
}
public int getIndex() {
return index;
}
@ -85,7 +91,8 @@ public class TaskDispatcher {
try {
String key = taskList.get(index).take();
String key = queue.poll(partitionConfig.getTaskDispatchPeriod(),
TimeUnit.MILLISECONDS);
if (dataSize == 0) {
keys = new ArrayList<>();

58
naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
View File

@ -24,12 +24,12 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.jmx.export.UnableToRegisterMBeanException;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
/**
@ -67,32 +67,44 @@ public class DistroFilter implements Filter {
}
}
String serviceName = req.getParameter(CommonParams.SERVICE_NAME);
try {
if (StringUtils.isNoneBlank(serviceName) && !HttpMethod.GET.name().equals(req.getMethod())
&& !distroMapper.responsible(serviceName)) {
String path = new URI(req.getRequestURI()).getPath();
String url = "http://" + distroMapper.mapSrv(serviceName) +
req.getRequestURI() + "?" + req.getQueryString();
try {
resp.setCharacterEncoding("utf-8");
resp.getWriter().write(distroMapper.mapSrv(serviceName));
resp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
} catch (Exception ignore) {
Loggers.SRV_LOG.warn("[DISTRO-FILTER] request failed: " + url);
String serviceName = req.getParameter(CommonParams.SERVICE_NAME);
boolean isMethodWrite =
(HttpMethod.POST.name().equals(req.getMethod()) || HttpMethod.DELETE.name().equals(req.getMethod()));
boolean isUrlInstance =
path.startsWith(UtilsAndCommons.NACOS_NAMING_CONTEXT + UtilsAndCommons.NACOS_NAMING_INSTANCE_CONTEXT);
if (isUrlInstance && isMethodWrite && !distroMapper.responsible(serviceName)) {
String url = "http://" + distroMapper.mapSrv(serviceName) +
req.getRequestURI() + "?" + req.getQueryString();
try {
resp.setCharacterEncoding("utf-8");
resp.getWriter().write(distroMapper.mapSrv(serviceName));
resp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
} catch (Exception ignore) {
Loggers.SRV_LOG.warn("[DISTRO-FILTER] request failed: " + url);
}
return;
}
return;
String groupName = req.getParameter(CommonParams.GROUP_NAME);
if (StringUtils.isBlank(groupName)) {
groupName = UtilsAndCommons.DEFAULT_GROUP_NAME;
}
OverrideParameterRequestWrapper requestWrapper = OverrideParameterRequestWrapper.buildRequest(req);
requestWrapper.addParameter(CommonParams.SERVICE_NAME, groupName + UtilsAndCommons.GROUP_SERVICE_CONNECTOR + serviceName);
filterChain.doFilter(requestWrapper, resp);
} catch (Exception e) {
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Server failed," + UtilsAndCommons.getAllExceptionMsg(e));
}
String groupName = req.getParameter(CommonParams.GROUP_NAME);
if (StringUtils.isBlank(groupName)) {
groupName = UtilsAndCommons.DEFAULT_GROUP_NAME;
}
OverrideParameterRequestWrapper requestWrapper = OverrideParameterRequestWrapper.buildRequest(req);
requestWrapper.addParameter(CommonParams.SERVICE_NAME, groupName + UtilsAndCommons.GROUP_SERVICE_CONNECTOR + serviceName);
filterChain.doFilter(requestWrapper, resp);
}
@Override