fix cancel task

ShawHee · Dec 13, 2023 · cae0414 · cae0414
1 parent acb6087
commit cae0414
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizingQueue.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/OptimizingQueue.java
@@ -381,11 +381,10 @@ public Status getStatus() {
     public void close() {
       lock.lock();
       try {
-        clearProcess(this);
-        taskMap.values().forEach(TaskRuntime::tryCanceling);
         this.status = OptimizingProcess.Status.CLOSED;
         this.endTime = System.currentTimeMillis();
         persistProcessCompleted(false);
+        clearProcess(this);
       } finally {
         lock.unlock();
       }

diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java
@@ -352,7 +352,7 @@ private Set<Status> getNext() {
     }
 
     public synchronized boolean tryAccepting(Status targetStatus) {
-      if (owner.isClosed() || !getNext().contains(targetStatus)) {
+      if (!getNext().contains(targetStatus)) {
         return false;
       }
       status = targetStatus;