From e64df5a0daa2e784d9be6bd57765535695b429e9 Mon Sep 17 00:00:00 2001 From: "Ma,Gang" Date: Fri, 24 Jun 2016 18:14:58 +0800 Subject: [PATCH] KYLIN-1819 Exception swallowed when start DefaultScheduler fail --- .../kylin/job/impl/threadpool/DefaultScheduler.java | 13 +------------ .../org/apache/kylin/rest/controller/JobController.java | 15 +-------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java index dd22234..4831655 100644 --- a/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java +++ b/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/DefaultScheduler.java @@ -47,7 +47,7 @@ import com.google.common.collect.Maps; /** */ -public class DefaultScheduler implements Scheduler, ConnectionStateListener { +public class DefaultScheduler implements Scheduler { private ExecutableManager executableManager; private FetcherRunner fetcher; @@ -141,17 +141,6 @@ public class DefaultScheduler implements Scheduler, Connecti return INSTANCE; } - @Override - public void stateChanged(CuratorFramework client, ConnectionState newState) { - if ((newState == ConnectionState.SUSPENDED) || (newState == ConnectionState.LOST)) { - try { - shutdown(); - } catch (SchedulerException e) { - throw new RuntimeException("failed to shutdown scheduler", e); - } - } - } - public synchronized static DefaultScheduler createInstance() { destroyInstance(); INSTANCE = new DefaultScheduler(); diff --git a/server/src/main/java/org/apache/kylin/rest/controller/JobController.java b/server/src/main/java/org/apache/kylin/rest/controller/JobController.java index f74104c..009809c 100644 --- a/server/src/main/java/org/apache/kylin/rest/controller/JobController.java +++ b/server/src/main/java/org/apache/kylin/rest/controller/JobController.java @@ -82,20 +82,7 @@ public class JobController extends BasicController implements InitializingBean { jobLock = (JobLock) ClassUtil.newInstance(kylinConfig.getJobControllerLock()); - new Thread(new Runnable() { - @Override - public void run() { - try { - scheduler.init(new JobEngineConfig(kylinConfig), jobLock); - while (!scheduler.hasStarted()) { - logger.error("scheduler has not been started"); - Thread.sleep(1000); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - }).start(); + scheduler.init(new JobEngineConfig(kylinConfig), jobLock); Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { @Override -- 2.6.4