Merge pull request #14264 from thingsboard/fix/job-cancellation

Task manager: improve task cancellation handling

application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java

@@ -98,7 +98,7 @@ public class JobManagerTest extends AbstractControllerTest {
         await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
             Job job = findJobById(jobId);
             assertThat(job.getStatus()).isEqualTo(JobStatus.RUNNING);
-            assertThat(job.getResult().getSuccessfulCount()).isBetween(1, tasksCount - 1);
+            assertThat(job.getResult().getSuccessfulCount()).isBetween(0, tasksCount - 1);
             assertThat(job.getResult().getTotalCount()).isEqualTo(tasksCount);
         });
         await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {

application/src/test/java/org/thingsboard/server/service/job/JobManagerTest_EntityPartitioningStrategy.java

@@ -27,17 +27,16 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 public class JobManagerTest_EntityPartitioningStrategy extends JobManagerTest {
 
     /*
-    * Some tests are overridden because they are based on
+     * Some tests are overridden because they are based on
-    * tenant partitioning strategy (subsequent tasks processing within a tenant)
+     * tenant partitioning strategy (subsequent tasks processing within a tenant)
-    * */
+     * */
 
     @Override
-    public void testCancelJob_simulateTaskProcessorRestart() throws Exception {
+    public void testCancelJob_simulateTaskProcessorRestart() {
     }
 
     @Override
     public void testSubmitJob_generalError() {
-
     }
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/job/JobResult.java

@@ -55,11 +55,17 @@ public abstract class JobResult implements Serializable {
 
     public void processTaskResult(TaskResult taskResult) {
         if (taskResult.isSuccess()) {
-            successfulCount++;
+            if (totalCount == null || successfulCount < totalCount) {
+                successfulCount++;
+            }
         } else if (taskResult.isDiscarded()) {
-            discardedCount++;
+            if (totalCount == null || discardedCount < totalCount) {
+                discardedCount++;
+            }
         } else {
-            failedCount++;
+            if (totalCount == null || failedCount < totalCount) {
+                failedCount++;
+            }
             if (results.size() < 100) { // preserving only first 100 errors, not reprocessing if there are more failures
                 results.add(taskResult);
             }

dao/src/main/java/org/thingsboard/server/dao/job/DefaultJobService.java

@@ -87,11 +87,7 @@ public class DefaultJobService extends AbstractEntityService implements JobServi
         }
         job.getResult().setCancellationTs(System.currentTimeMillis());
         JobStatus prevStatus = job.getStatus();
-        if (job.getStatus() == QUEUED) {
+        job.setStatus(CANCELLED);
-            job.setStatus(CANCELLED); // setting cancelled status right away, because we don't expect stats for cancelled tasks
-        } else if (job.getStatus() == PENDING) {
-            job.setStatus(RUNNING);
-        }
         saveJob(tenantId, job, true, prevStatus);
     }
 
@@ -145,7 +141,7 @@ public class DefaultJobService extends AbstractEntityService implements JobServi
             }
         }
 
-        if (job.getStatus() == RUNNING) {
+        if (job.getStatus().isOneOf(RUNNING, CANCELLED)) {
             if (result.getTotalCount() != null && result.getCompletedCount() >= result.getTotalCount()) {
                 if (result.getCancellationTs() > 0) {
                     job.setStatus(CANCELLED);
@@ -193,7 +189,7 @@ public class DefaultJobService extends AbstractEntityService implements JobServi
 
     private void checkWaitingJobs(TenantId tenantId, JobType jobType) {
         Job queuedJob = jobDao.findOldestByTenantIdAndTypeAndStatusForUpdate(tenantId, jobType, QUEUED);
-        if (queuedJob == null) {
+        if (queuedJob == null || jobDao.existsByTenantIdAndTypeAndStatusOneOf(tenantId, jobType, PENDING, RUNNING)) {
             return;
         }
         queuedJob.setStatus(PENDING);