chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

增减jmx状态控制

Browse Source
This commit is contained in:
mcy
2019-07-12 20:59:20 +08:00
parent c2ce662f9a
commit 31ae308760
8 changed files with 321 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/NodeServerController.java
View File

@@ -21,12 +21,6 @@ public class NodeServerController {
return BaseModel.getInstance(nodeServerService.findList(nodeServer));
}
@DeleteMapping(value = "/nodeServer/{id}")
public BaseModel<String> delete(@PathVariable Long id, @PathVariable String env) {
nodeServerService.delete(id);
return BaseModel.getInstance("success");
}
@PostMapping(value = "/nodeServer")
public BaseModel<String> save(@RequestBody NodeServer nodeServer, @PathVariable String env) {
nodeServerService.save(nodeServer);
@@ -38,8 +32,21 @@ public class NodeServerController {
return BaseModel.getInstance(nodeServerService.detail(id));
}
@PutMapping(value = "/nodeServer")
public BaseModel<String> update(@RequestBody NodeServer nodeServer, @PathVariable String env) {
nodeServerService.update(nodeServer);
return BaseModel.getInstance("success");
}
@DeleteMapping(value = "/nodeServer/{id}")
public BaseModel<String> delete(@PathVariable Long id, @PathVariable String env) {
nodeServerService.delete(id);
return BaseModel.getInstance("success");
}
@GetMapping(value = "/nodeServer/status")
public BaseModel<Integer> status(@RequestParam String ip, @RequestParam Integer port, @PathVariable String env) {
return BaseModel.getInstance(nodeServerService.remoteNodeStatus(ip,port));
return BaseModel.getInstance(nodeServerService.remoteNodeStatus(ip, port));
}
}

9
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/NodeServerServiceImpl.java
View File

@@ -33,8 +33,6 @@ public class NodeServerServiceImpl implements NodeServerService {
}
nodeServer.save();
// 检测节点状态
}
public NodeServer detail(Long id) {
@@ -43,8 +41,6 @@ public class NodeServerServiceImpl implements NodeServerService {
public void update(NodeServer nodeServer) {
nodeServer.update("name", "ip", "port", "port2");
// 检测节点状态
}
public void delete(Long id) {
@@ -66,10 +62,13 @@ public class NodeServerServiceImpl implements NodeServerService {
}
query.order().asc("id");
List<NodeServer> nodeServers = query.findList();
if (nodeServers.isEmpty()) {
return nodeServers;
}
ExecutorService executorService = Executors.newFixedThreadPool(nodeServers.size());
List<Future<Boolean>> futures = new ArrayList<>(nodeServers.size());
// 取每个节点的状态
// get all nodes status
for (NodeServer ns : nodeServers) {
futures.add(executorService.submit(() -> {
int status = -1;