#459 Refactor speed up shutdown

Author: lzw2006

saturn-core/src/main/java/com/vip/saturn/job/basic/AbstractElasticJob.java

@@ -96,13 +96,6 @@ public void shutdown() {
 		}
 	}
 
-	@Override
-	public void shutdownGracefully() {
-		if (scheduler != null) {
-			scheduler.shutdownNow();
-		}
-	}
-
 	public ExecutorService getExecutorService() {
 		return jobScheduler.getExecutorService();
 	}

saturn-core/src/main/java/com/vip/saturn/job/basic/JobScheduler.java

@@ -291,7 +291,6 @@ public void shutdown(boolean removejob) {
 			try {
 				if (job != null) {
 					job.shutdown();
-					Thread.sleep(500);// NOSONAR
 				}
 			} catch (final Exception e) {
 				log.error(String.format(SaturnConstant.LOG_FORMAT_FOR_STRING, jobName, e.getMessage()), e);
@@ -310,12 +309,13 @@ public void shutdown(boolean removejob) {
 			limitMaxJobsService.shutdown();
 
 			zkCacheManager.shutdown();
-			try {
-				Thread.sleep(500);// NOSONAR
-			} catch (InterruptedException ignore) {
-				log.warn(ignore.getMessage());
-			}
+
 			if (removejob) {
+				try {
+					Thread.sleep(500);// NOSONAR
+				} catch (InterruptedException ignore) {
+					log.warn(ignore.getMessage());
+				}
 				jobNodeStorage.deleteJobNode();
 				saturnExecutorService.removeJobName(jobName);
 			}
@@ -327,32 +327,6 @@ public void shutdown(boolean removejob) {
 		}
 	}
 
-	public void shutdownGracefully() {
-		synchronized (isShutdownFlag) {
-			isShutdownFlag.set(true);
-			if (job != null) {
-				job.shutdownGracefully();
-			}
-			listenerManager.shutdown();
-			shardingService.shutdown();
-			configService.shutdown();
-			leaderElectionService.shutdown();
-			serverService.shutdown();
-			executionContextService.shutdown();
-			executionService.shutdown();
-			failoverService.shutdown();
-			statisticsService.shutdown();
-			analyseService.shutdown();
-			limitMaxJobsService.shutdown();
-			zkCacheManager.shutdown();
-
-			JobRegistry.clearJob(executorName, jobName);
-			if (executorService != null && !executorService.isShutdown()) {
-				executorService.shutdown();
-			}
-		}
-	}
-
 	/**
 	 * 重新调度作业.
 	 *

saturn-core/src/main/java/com/vip/saturn/job/basic/Stopable.java

@@ -44,9 +44,4 @@ public interface Stopable {
 	 * 关闭作业
 	 */
 	void shutdown();
-
-	/**
-	 * 优雅关闭作业
-	 */
-	void shutdownGracefully();
 }

saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java

@@ -458,7 +458,7 @@ private void shutdownAllCountThread() {
 		}
 	}
 
-	private void shutdownUnfinishJob(boolean shutdownGracefully) {
+	private void shutdownUnfinishJob() {
 		Map<String, JobScheduler> schdMap = JobRegistry.getSchedulerMap().get(executorName);
 		if (schdMap != null) {
 			Iterator<String> it = schdMap.keySet().iterator();
@@ -470,11 +470,7 @@ private void shutdownUnfinishJob(boolean shutdownGracefully) {
 						log.info("[{}] msg=job {} is enabled, force shutdown.", jobName, jobName);
 						jobScheduler.stopJob(true);
 					}
-					if (shutdownGracefully) {
-						jobScheduler.shutdownGracefully();
-					} else {
-						jobScheduler.shutdown(false);
-					}
+					jobScheduler.shutdown(false);
 				}
 			}
 		}
@@ -490,7 +486,7 @@ private void shutdown0() throws Exception {
 			if (saturnExecutorService != null) {
 				saturnExecutorService.unregisterJobsWatcher();
 			}
-			shutdownUnfinishJob(false);
+			shutdownUnfinishJob();
 			if (saturnExecutorService != null) {
 				saturnExecutorService.unregisterExecutor();
 			}
@@ -537,7 +533,7 @@ private void shutdownGracefully0() throws Exception {
 			TimeoutSchedulerExecutor.shutdownScheduler(executorName);
 			try {
 				blockUntilJobCompletedIfNotTimeout();
-				shutdownUnfinishJob(true);
+				shutdownUnfinishJob();
 				JobRegistry.clearExecutor(executorName);
 			} finally {
 				if (connectionLostListener != null) {

saturn-core/src/main/java/com/vip/saturn/job/trigger/SaturnScheduler.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author chembo.huang
@@ -56,11 +57,11 @@ public Trigger getTrigger() {
 	public void shutdown() {
 		saturnQuartzWorker.halt();
 		executor.shutdown();
-	}
-
-	public void shutdownNow() {
-		saturnQuartzWorker.halt();
-		executor.shutdownNow();
+		try {
+			executor.awaitTermination(500, TimeUnit.MICROSECONDS);
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+		}
 	}
 
 	public void triggerJob() {