Fixed #290.

apache · Apr 18, 2017 · 34d698e · 34d698e
1 parent ef8963f
commit 34d698e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/...uler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java b/...uler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java
@@ -132,6 +132,7 @@ public void update(final CloudJobConfiguration jobConfig) {
     public void deregister(final String jobName) {
         Optional<CloudJobConfiguration> jobConfig = configService.load(jobName);
         if (jobConfig.isPresent()) {
+            disableJobService.remove(jobName);
             configService.remove(jobName);
             transientProducerScheduler.deregister(jobConfig.get());
         }

diff --git a/...er/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java b/...er/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/restful/CloudAppRestfulApi.java
@@ -207,6 +207,7 @@ private void removeAppAndJobConfigurations(final String appName) {
                 producerManager.deregister(each.getJobName());
             }
         }
+        disableAppService.remove(appName);
         appConfigService.remove(appName);
     }
 

diff --git a/.../src/test/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManagerTest.java b/.../src/test/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManagerTest.java
@@ -191,6 +191,7 @@ public void assertDeregisterExisted() {
         for (TaskContext each : taskContexts) {
             verify(schedulerDriver).killTask(Protos.TaskID.newBuilder().setValue(each.getId()).build());
         }
+        verify(disableJobService).remove("transient_test_job");
         verify(configService).remove("transient_test_job");
         verify(runningService).remove("transient_test_job");
         verify(readyService).remove(Lists.newArrayList("transient_test_job"));
-Original file line number
+Diff line change
@@ Expand Up @@
                     producerManager.deregister(each.getJobName());
                 }
             }
+            disableAppService.remove(appName);
             appConfigService.remove(appName);
         }
@@ Expand Down @@