github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

sleep when resource in not satisfy. fix #1522

pull/2/head
dk.technoboy 5 years ago
parent
ac426f9025
commit
836bf483f8
1 changed files with 28 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java

57
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java
Unescape View File

@ -98,39 +98,38 @@ public class MasterSchedulerThread implements Runnable {
InterProcessMutex mutex = null; InterProcessMutex mutex = null;
try { try {
if(OSUtils.checkResource(masterConfig.getMasterMaxCpuloadAvg(), masterConfig.getMasterReservedMemory())){ boolean runCheckFlag = OSUtils.checkResource(masterConfig.getMasterMaxCpuloadAvg(), masterConfig.getMasterReservedMemory());
if (zkMasterClient.getZkClient().getState() == CuratorFrameworkState.STARTED) { if(!runCheckFlag) {
Thread.sleep(Constants.SLEEP_TIME_MILLIS);
// create distributed lock with the root node path of the lock space as /dolphinscheduler/lock/masters continue;
String znodeLock = zkMasterClient.getMasterLockPath(); }
if (zkMasterClient.getZkClient().getState() == CuratorFrameworkState.STARTED) {
mutex = new InterProcessMutex(zkMasterClient.getZkClient(), znodeLock);
mutex.acquire(); // create distributed lock with the root node path of the lock space as /dolphinscheduler/lock/masters
String znodeLock = zkMasterClient.getMasterLockPath();
ThreadPoolExecutor poolExecutor = (ThreadPoolExecutor) masterExecService;
int activeCount = poolExecutor.getActiveCount(); mutex = new InterProcessMutex(zkMasterClient.getZkClient(), znodeLock);
// make sure to scan and delete command table in one transaction mutex.acquire();
Command command = processDao.findOneCommand();
if (command != null) { ThreadPoolExecutor poolExecutor = (ThreadPoolExecutor) masterExecService;
logger.info(String.format("find one command: id: %d, type: %s", command.getId(),command.getCommandType().toString())); int activeCount = poolExecutor.getActiveCount();
// make sure to scan and delete command table in one transaction
try{ Command command = processDao.findOneCommand();
processInstance = processDao.handleCommand(logger, OSUtils.getHost(), this.masterExecThreadNum - activeCount, command); if (command != null) {
if (processInstance != null) { logger.info(String.format("find one command: id: %d, type: %s", command.getId(),command.getCommandType().toString()));
logger.info("start master exec thread , split DAG ...");
masterExecService.execute(new MasterExecThread(processInstance,processDao)); try{
} processInstance = processDao.handleCommand(logger, OSUtils.getHost(), this.masterExecThreadNum - activeCount, command);
}catch (Exception e){ if (processInstance != null) {
logger.error("scan command error ", e); logger.info("start master exec thread , split DAG ...");
processDao.moveToErrorCommand(command, e.toString()); masterExecService.execute(new MasterExecThread(processInstance,processDao));
} }
}catch (Exception e){
logger.error("scan command error ", e);
processDao.moveToErrorCommand(command, e.toString());
} }
} }
} }
// accessing the command table every SLEEP_TIME_MILLIS milliseconds
Thread.sleep(Constants.SLEEP_TIME_MILLIS);
}catch (Exception e){ }catch (Exception e){
logger.error("master scheduler thread exception : " + e.getMessage(),e); logger.error("master scheduler thread exception : " + e.getMessage(),e);
}finally{ }finally{

Write Preview
Loading…
Cancel
Save