feat: delete task throws exception if running

ICIJ · Nov 12, 2024 · 5f8eddb · 5f8eddb
1 parent 9fc0e35
commit 5f8eddb
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 0 deletions.
diff --git a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskManagerAmqp.java b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskManagerAmqp.java
@@ -60,6 +60,10 @@ public boolean stopTask(String taskId) {
 
     @Override
     public <V> Task<V> clearTask(String taskId) {
+        if (tasks.get(taskId).getState() == Task.State.RUNNING) {
+            throw new IllegalStateException(String.format("task id <%s> is already in RUNNING state", taskId));
+        }
+        logger.info("deleting task id <{}>", taskId);
         return (Task<V>) tasks.remove(taskId);
     }
 

diff --git a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskManagerMemory.java b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskManagerMemory.java
@@ -146,6 +146,10 @@ public List<Task<?>> clearDoneTasks() {
 
     @Override
     public <V> Task<V> clearTask(String taskName) {
+        if (tasks.get(taskName).getState() == Task.State.RUNNING) {
+            throw new IllegalStateException(String.format("task id <%s> is already in RUNNING state", taskName));
+        }
+        logger.info("deleting task id <{}>", taskName);
         return (Task<V>) tasks.remove(taskName);
     }
 

diff --git a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskManagerRedis.java b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskManagerRedis.java
@@ -84,6 +84,10 @@ public List<Task<?>> clearDoneTasks() {
 
     @Override
     public Task<?> clearTask(String taskId) {
+        if (tasks.get(taskId).getState() == Task.State.RUNNING) {
+            throw new IllegalStateException(String.format("task id <%s> is already in RUNNING state", taskId));
+        }
+        logger.info("deleting task id <{}>", taskId);
         return tasks.remove(taskId);
     }
 

diff --git a/datashare-tasks/src/test/java/org/icij/datashare/asynctasks/TaskManagerAmqpTest.java b/datashare-tasks/src/test/java/org/icij/datashare/asynctasks/TaskManagerAmqpTest.java
@@ -148,6 +148,22 @@ public void test_clear_task_among_two_tasks() throws Exception {
         assertThat(taskManager.getTasks()).hasSize(1);
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void test_clear_running_task_should_throw_exception() throws Exception {
+        taskManager.startTask("taskName", User.local(), new HashMap<>());
+
+        assertThat(taskManager.getTasks()).hasSize(1);
+
+        // in the task runner loop
+        Task<Serializable> task = taskQueue.poll(1, TimeUnit.SECONDS); // to sync
+        taskSupplier.progress(task.id,0.5);
+        nextMessage.await();
+
+        assertThat(taskManager.getTask(task.id).getState()).isEqualTo(Task.State.RUNNING);
+
+        taskManager.clearTask(task.id);
+    }
+
     @Test(timeout = 2000)
     public void test_task_canceled() throws Exception {
         taskManager.startTask("taskName", User.local(), new HashMap<>());

diff --git a/datashare-tasks/src/test/java/org/icij/datashare/asynctasks/TaskManagerMemoryTest.java b/datashare-tasks/src/test/java/org/icij/datashare/asynctasks/TaskManagerMemoryTest.java
@@ -91,6 +91,18 @@ public void test_clear_the_only_task() throws Exception {
         assertThat(taskManager.getTasks()).hasSize(0);
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void test_clear_running_task_should_throw_exception() throws Exception {
+        Task<Integer> task = new Task<>("sleep", User.local(), Map.of("intParameter", 12));
+
+        taskManager.startTask(task);
+        taskManager.shutdownAndAwaitTermination(1, TimeUnit.SECONDS);
+        taskManager.progress(task.id, 0.5);
+        assertThat(taskManager.getTask(task.id).getState()).isEqualTo(Task.State.RUNNING);
+
+        taskManager.clearTask(task.id);
+    }
+
     @Test
     public void test_progress_on_unknown_task() throws InterruptedException {
         taskManager.shutdownAndAwaitTermination(1, TimeUnit.SECONDS);

diff --git a/datashare-tasks/src/test/java/org/icij/datashare/asynctasks/TaskManagerRedisTest.java b/datashare-tasks/src/test/java/org/icij/datashare/asynctasks/TaskManagerRedisTest.java
@@ -117,6 +117,17 @@ public void test_clear_task_among_two_tasks() throws Exception {
         assertThat(taskManager.getTask(taskView2Id)).isNotNull();
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void test_clear_running_task_should_throw_exception() throws Exception {
+        String taskViewId = taskManager.startTask("sleep", User.local(), new HashMap<>());
+
+        taskSupplier.progress(taskViewId,0.5);
+        assertThat(waitForEvent.await(1, TimeUnit.SECONDS)).isTrue();
+        assertThat(taskManager.getTask(taskViewId).getState()).isEqualTo(Task.State.RUNNING);
+
+        taskManager.clearTask(taskViewId);
+    }
+
     @Test
     public void test_done_task_result_for_file() throws Exception {
         String taskViewId = taskManager.startTask("HelloWorld", User.local(), new HashMap<>() {{