Merge branch 'v3.4.2' into jenkins_auto_build

This commit is contained in:
tjq 2021-01-03 13:02:05 +08:00
commit f391591683
2 changed files with 5 additions and 3 deletions

View File

@ -56,8 +56,7 @@ public class CommonTaskTracker extends TaskTracker {
// 持久化根任务
persistenceRootTask();
// 启动定时任务任务派发 & 状态检查
scheduledPool.scheduleWithFixedDelay(new Dispatcher(), 0, 5, TimeUnit.SECONDS);
// 开启定时状态检查
scheduledPool.scheduleWithFixedDelay(new StatusCheckRunnable(), 13, 13, TimeUnit.SECONDS);
// 如果是 MR 任务则需要启动执行器动态检测装置
@ -65,6 +64,9 @@ public class CommonTaskTracker extends TaskTracker {
if (executeType == ExecuteType.MAP || executeType == ExecuteType.MAP_REDUCE) {
scheduledPool.scheduleAtFixedRate(new WorkerDetector(), 1, 1, TimeUnit.MINUTES);
}
// 最后启动任务派发器否则会出现 TaskTracker 还未创建完毕 ProcessorTracker 已开始汇报状态的情况
scheduledPool.scheduleWithFixedDelay(new Dispatcher(), 10, 5000, TimeUnit.MILLISECONDS);
}
@Override

View File

@ -119,7 +119,7 @@ public abstract class TaskTracker {
case FIX_DELAY:return new FrequentTaskTracker(req);
default:return new CommonTaskTracker(req);
}
}catch (Exception e) {
} catch (Exception e) {
log.warn("[TaskTracker-{}] create TaskTracker from request({}) failed.", req.getInstanceId(), req, e);
// 直接发送失败请求