1570 Increase TimeUnit.SECONDS.sleep duration in TaskWorkerTest for improved test stability; add future cancellation on timeout in TaskWorker.

Author: ivicac

server/libs/atlas/atlas-worker/atlas-worker-impl/src/main/java/com/bytechef/atlas/worker/TaskWorker.java

@@ -146,6 +146,8 @@ public void onTaskExecutionEvent(TaskExecutionEvent taskExecutionEvent) {
         try {
             future.get(calculateTimeout(taskExecution), TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            future.cancel(true);
+
             handleException(taskExecution, e);
         } catch (CancellationException e) {
             logger.debug("Cancelled task: {}", taskExecution.getId());

server/libs/atlas/atlas-worker/atlas-worker-impl/src/test/java/com/bytechef/atlas/worker/TaskWorkerTest.java

@@ -364,7 +364,7 @@ public void test6() throws InterruptedException {
         executorService.submit(() -> worker.onTaskExecutionEvent(new TaskExecutionEvent(taskExecution)));
 
         // give it a second to start executing
-        TimeUnit.SECONDS.sleep(1);
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(1, MapUtils.size(worker.getTaskExecutions()));
 
@@ -374,7 +374,7 @@ public void test6() throws InterruptedException {
                 Validate.notNull(taskExecution.getJobId(), "jobId"), Validate.notNull(taskExecution.getId(), "id"))));
 
         // give it a second to cancel
-        TimeUnit.SECONDS.sleep(1);
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(0, MapUtils.size(worker.getTaskExecutions()));
     }
@@ -420,7 +420,7 @@ public void test7() throws InterruptedException {
         EXECUTOR_SERVICE.submit(() -> worker.onTaskExecutionEvent(new TaskExecutionEvent(taskExecution2)));
 
         // give it a second to start executing
-        TimeUnit.SECONDS.sleep(1);
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(2, MapUtils.size(worker.getTaskExecutions()));
 
@@ -430,7 +430,7 @@ public void test7() throws InterruptedException {
                 Validate.notNull(taskExecution1.getJobId(), "jobId"), Validate.notNull(taskExecution1.getId(), "id"))));
 
         // give it a second to cancel
-        TimeUnit.SECONDS.sleep(1);
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(1, MapUtils.size(worker.getTaskExecutions()));
     }
@@ -477,7 +477,7 @@ public void test8() throws InterruptedException {
         EXECUTOR_SERVICE.submit(() -> worker.onTaskExecutionEvent(new TaskExecutionEvent(taskExecution2)));
 
         // give it a second to start executing
-        TimeUnit.SECONDS.sleep(1);
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(2, MapUtils.size(worker.getTaskExecutions()));
 
@@ -487,7 +487,7 @@ public void test8() throws InterruptedException {
                 Validate.notNull(taskExecution1.getJobId(), "jobId"), Validate.notNull(taskExecution1.getId(), "id"))));
 
         // give it a second to cancel
-        TimeUnit.SECONDS.sleep(1);
+        TimeUnit.SECONDS.sleep(2);
 
         Assertions.assertEquals(0, MapUtils.size(worker.getTaskExecutions()));
     }