test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-03 04:39:00 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Refactor worker (#2121)

Browse Source 
* refactor worker registry

* refactor master server

* refactor MasterSchedulerService
This commit is contained in:
Tboy 2020-03-09 10:29:38 +08:00 committed by GitHub
parent 290772dfaa
commit fd6f13fff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
View File

@ -26,6 +26,7 @@ import org.apache.dolphinscheduler.server.master.processor.TaskAckProcessor;
import org.apache.dolphinscheduler.server.master.processor.TaskKillResponseProcessor;
import org.apache.dolphinscheduler.server.master.processor.TaskResponseProcessor;
import org.apache.dolphinscheduler.server.master.registry.MasterRegistry;
import org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService;
import org.apache.dolphinscheduler.server.zk.ZKMasterClient;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
import org.apache.dolphinscheduler.service.quartz.QuartzExecutors;
@ -80,6 +81,9 @@ public class MasterServer {
@Autowired
private ZKMasterClient zkMasterClient;
@Autowired
private MasterSchedulerService masterSchedulerService;
/**
* master server startup
*
@ -109,6 +113,8 @@ public class MasterServer {
//
this.zkMasterClient.start();
this.masterRegistry.registry();
//
masterSchedulerService.start();
// start QuartzExecutors
// what system should do if exception
@ -162,6 +168,7 @@ public class MasterServer {
this.nettyRemotingServer.close();
this.masterRegistry.unRegistry();
this.zkMasterClient.close();
this.masterSchedulerService.close();
//close quartz
try{

30
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java
View File

@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.util.concurrent.ThreadPoolExecutor;
/**
@ -49,11 +47,6 @@ public class MasterSchedulerService extends Thread {
*/
private static final Logger logger = LoggerFactory.getLogger(MasterSchedulerService.class);
/**
* master exec service
*/
private ThreadPoolExecutor masterExecService;
/**
* dolphinscheduler database interface
*/
@ -66,28 +59,33 @@ public class MasterSchedulerService extends Thread {
@Autowired
private ZKMasterClient zkMasterClient;
/**
* netty remoting client
*/
private NettyRemotingClient nettyRemotingClient;
@Autowired
private MasterConfig masterConfig;
/**
* netty remoting client
*/
private final NettyRemotingClient nettyRemotingClient;
/**
* master exec service
*/
private final ThreadPoolExecutor masterExecService;
/**
* constructor of MasterSchedulerThread
*/
@PostConstruct
public void init(){
public MasterSchedulerService(){
this.masterExecService = (ThreadPoolExecutor)ThreadUtils.newDaemonFixedThreadExecutor("Master-Exec-Thread", masterConfig.getMasterExecThreads());
NettyClientConfig clientConfig = new NettyClientConfig();
this.nettyRemotingClient = new NettyRemotingClient(clientConfig);
}
public void start(){
super.setName("MasterSchedulerThread");
super.start();
}
@PreDestroy
public void close(){
nettyRemotingClient.close();
logger.info("master schedule service stopped...");