fix bug

ltsopensource · Mar 20, 2015 · 5ef32ec · 5ef32ec
1 parent 1725b60
commit 5ef32ec
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/job-core/src/main/java/com/lts/job/core/cluster/MasterElector.java b/job-core/src/main/java/com/lts/job/core/cluster/MasterElector.java
@@ -22,7 +22,7 @@ public class MasterElector {
 
     private Application application;
     private List<MasterNodeChangeListener> masterNodeChangeListenerList;
-    private Node master;
+    private volatile Node master;
 
     public MasterElector(Application application) {
         this.application = application;

diff --git a/job-example/src/main/java/com/lts/job/example/api/JobClientTest.java b/job-example/src/main/java/com/lts/job/example/api/JobClientTest.java
@@ -2,11 +2,14 @@
 
 import com.lts.job.client.JobClient;
 import com.lts.job.client.RetryJobClient;
+import com.lts.job.client.domain.Response;
+import com.lts.job.core.domain.Job;
 import com.lts.job.example.support.BaseJobClientTest;
 import com.lts.job.example.support.JobFinishedHandlerImpl;
 import com.lts.job.example.support.MasterNodeChangeListenerImpl;
 
 import java.io.IOException;
+import java.util.UUID;
 
 /**
  * @author Robert HG ([email protected]) on 8/13/14.

diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/DeadJobChecker.java b/job-tracker/src/main/java/com/lts/job/tracker/support/DeadJobChecker.java
@@ -57,8 +57,16 @@ public DeadJobChecker(Application application) {
         this.commandWrapper = application.getCommandWrapper();
     }
 
+    private volatile boolean start;
+    private ScheduledFuture<?> scheduledFuture;
+
     public void start() {
-        ScheduledFuture<?> scheduledFuture = FIXED_EXECUTOR_SERVICE.scheduleWithFixedDelay(new Runnable() {
+        if (start) {
+            return;
+        }
+        start = true;
+
+        scheduledFuture = FIXED_EXECUTOR_SERVICE.scheduleWithFixedDelay(new Runnable() {
             @Override
             public void run() {
                 try {
@@ -158,7 +166,11 @@ private JobMongoRepository getJobRepository() {
     }
 
     public void stop() {
-        FIXED_EXECUTOR_SERVICE.shutdown();
+        if (start) {
+            start = false;
+            scheduledFuture.cancel(true);
+            FIXED_EXECUTOR_SERVICE.shutdown();
+        }
     }
 
 }