#526 wait some time for termination, when gracefully shutdown. So som…

…e job operation can be finished.
vipshop · Oct 24, 2018 · 5373f5d · 5373f5d
1 parent 0dacbbc
commit 5373f5d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/saturn-core/src/main/java/com/vip/saturn/job/basic/AbstractElasticJob.java b/saturn-core/src/main/java/com/vip/saturn/job/basic/AbstractElasticJob.java
@@ -104,6 +104,7 @@ public void shutdown() {
 							JobType.SHELL_JOB.name());
 				} else {
 					abort();
+					scheduler.awaitTermination(500L);
 				}
 			}
 		}

diff --git a/saturn-core/src/main/java/com/vip/saturn/job/trigger/SaturnScheduler.java b/saturn-core/src/main/java/com/vip/saturn/job/trigger/SaturnScheduler.java
@@ -6,6 +6,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author chembo.huang
@@ -57,6 +58,14 @@ public boolean isTerminated() {
 		return executor.isTerminated();
 	}
 
+	public void awaitTermination(long timeout) {
+		try {
+			executor.awaitTermination(timeout, TimeUnit.MILLISECONDS);
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+		}
+	}
+
 	public void triggerJob() {
 		saturnQuartzWorker.trigger();
 	}