Do not supply replicates past their contribution deadlines to workers (#702)

Author: jbern0rd

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/vNEXT) 2024
 
+### Deprecation Notices
+
+- Deprecate legacy task feedback API endpoints. (#701)
+
 ### New Features
 
 - Create `iexec-task-api` to access task feedback API. (#695)
@@ -15,7 +19,7 @@ All notable changes to this project will be documented in this file.
 
 - Always use `WorkerpoolAuthorization` to retrieve JWT and check result upload on Result Proxy. (#690)
 - Use correct `Signature` import in `SchedulerClient`. (#697)
-- Deprecate legacy task feedback API endpoints. (#701)
+- Do not supply replicates past their contribution deadline to workers. (#702)
 
 ### Quality
 

src/main/java/com/iexec/core/task/TaskRepository.java

@@ -39,22 +39,23 @@ public interface TaskRepository extends MongoRepository<Task, String> {
     /**
      * Retrieves the prioritized task matching with given criteria:
      * <ul>
-     *     <li>Task is in one of given {@code statuses};</li>
-     *     <li>Task has not given {@code excludedTag}
-     *          - this is mainly used to exclude TEE tasks;
-     *     </li>
-     *     <li>Chain task ID is not one of the given {@code excludedChainTaskIds};</li>
-     *     <li>Tasks are prioritized according to the {@code sort} parameter.</li>
+     *     <li>Task is in one of given {@code statuses}
+     *     <li>Task contribution deadline is after a provided {@code timestamp}
+     *     <li>Task has not given {@code excludedTags}, this is mainly used to exclude TEE tasks
+     *     <li>Chain task ID is not one of the given {@code excludedChainTaskIds}
+     *     <li>Tasks are prioritized according to the {@code sort} parameter
      * </ul>
      *
      * @param statuses             The task status should be one of this list.
+     * @param timestamp            The task contribution deadline should be after the provided timestamp.
      * @param excludedTags         The task tag should not be one this tag list
      *                             - use {@literal null} if no tag should be excluded.
      * @param excludedChainTaskIds The chain task ID should not be one of this list.
      * @param sort                 How to prioritize tasks.
      * @return The first task matching with the criteria, according to the {@code sort} parameter.
      */
-    Optional<Task> findFirstByCurrentStatusInAndTagNotInAndChainTaskIdNotIn(List<TaskStatus> statuses, List<String> excludedTags, List<String> excludedChainTaskIds, Sort sort);
+    Optional<Task> findFirstByCurrentStatusInAndContributionDeadlineAfterAndTagNotInAndChainTaskIdNotIn(
+            List<TaskStatus> statuses, Date timestamp, List<String> excludedTags, List<String> excludedChainTaskIds, Sort sort);
 
     @Query(value = "{ finalDeadline: {$lt : ?0} }", fields = "{ chainTaskId: true }")
     List<Task> findChainTaskIdsByFinalDeadlineBefore(Date date);

src/main/java/com/iexec/core/task/TaskService.java

@@ -251,7 +251,7 @@ public Optional<Task> getPrioritizedInitializedOrRunningTask(
     }
 
     /**
-     * Shortcut for {@link TaskRepository#findFirstByCurrentStatusInAndTagNotInAndChainTaskIdNotIn}.
+     * Shortcut for {@link TaskRepository#findFirstByCurrentStatusInAndContributionDeadlineAfterAndTagNotInAndChainTaskIdNotIn}.
      * Retrieves the prioritized task matching with given criteria:
      * <ul>
      *     <li>Task is in one of given {@code statuses};</li>
@@ -273,8 +273,9 @@ private Optional<Task> findPrioritizedTask(List<TaskStatus> statuses,
                                                List<String> excludedTags,
                                                List<String> excludedChainTaskIds,
                                                Sort sort) {
-        return taskRepository.findFirstByCurrentStatusInAndTagNotInAndChainTaskIdNotIn(
+        return taskRepository.findFirstByCurrentStatusInAndContributionDeadlineAfterAndTagNotInAndChainTaskIdNotIn(
                 statuses,
+                new Date(),
                 excludedTags,
                 excludedChainTaskIds,
                 sort

src/test/java/com/iexec/core/task/TaskServiceTests.java

@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.boot.test.system.CapturedOutput;
@@ -67,6 +67,7 @@
 
 @DataMongoTest
 @Testcontainers
+@ExtendWith(MockitoExtension.class)
 @ExtendWith(OutputCaptureExtension.class)
 class TaskServiceTests {
     private final long maxExecutionTime = 60000;
@@ -101,7 +102,6 @@ static void initRegistry() {
 
     @BeforeEach
     void init() {
-        MockitoAnnotations.openMocks(this);
         taskRepository.deleteAll();
         taskService = new TaskService(mongoTemplate, taskRepository, iexecHubService, applicationEventPublisher);
     }
@@ -259,6 +259,7 @@ void shouldNotFindByCurrentStatusList() {
     }
     // endregion
 
+    // region getPrioritizedInitializedOrRunningTask
     @Test
     void shouldGetInitializedOrRunningTasks() {
         final Task task = getStubTask();
@@ -269,6 +270,17 @@ void shouldGetInitializedOrRunningTasks() {
                 .isEqualTo(Optional.of(task));
     }
 
+    @Test
+    void shouldNotGetTaskPastContributionDeadline() {
+        final Task task = getStubTask();
+        task.setContributionDeadline(Date.from(Instant.now().minus(1, ChronoUnit.MINUTES)));
+        taskRepository.save(task);
+        assertThat(taskService.getPrioritizedInitializedOrRunningTask(false, List.of()))
+                .usingRecursiveComparison()
+                .isEqualTo(Optional.empty());
+    }
+    // endregion
+
     @Test
     void shouldGetChainTaskIdsOfTasksExpiredBefore() {
         Date date = new Date();

src/test/java/com/iexec/core/task/TaskTestsUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2021-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@ public class TaskTestsUtils {
 
     public static Task getStubTask() {
         final Task task = new Task(CHAIN_DEAL_ID, 0, DAPP_NAME, COMMAND_LINE, 1, 60000, NO_TEE_TAG);
+        task.setContributionDeadline(Date.from(Instant.now().plus(1, ChronoUnit.MINUTES)));
         task.setFinalDeadline(Date.from(Instant.now().plus(1, ChronoUnit.MINUTES)));
         return task;
     }