Skip to content

Ensure delayed oneoff tasks get rescheduled on new deploy #2016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssalinas merged 2 commits into from
Oct 4, 2019
Merged

Ensure delayed oneoff tasks get rescheduled on new deploy #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8cce46
Ensure delayed oneoff tasks get rescheduled on new deploy
ssalinas Sep 13, 2019
3e4842d
change sort
ssalinas Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion SingularityService/src/main/java/com/hubspot/singularity/resources/TaskResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.List;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;

import javax.activation.MimetypesFileTypeMap;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -171,7 +172,10 @@ public List<SingularityTaskRequest> getScheduledTasks(
public List<SingularityPendingTaskId> getScheduledTaskIds(
@Parameter(hidden = true) @Auth SingularityUser user,
@Parameter(description = "Use the cached version of this data to limit expensive api calls") @QueryParam("useWebCache") Boolean useWebCache) {
return authorizationHelper.filterByAuthorizedRequests(user, taskManager.getPendingTaskIds(useWebCache(useWebCache)), SingularityTransformHelpers.PENDING_TASK_ID_TO_REQUEST_ID, SingularityAuthorizationScope.READ);
return authorizationHelper.filterByAuthorizedRequests(user, taskManager.getPendingTaskIds(useWebCache(useWebCache)), SingularityTransformHelpers.PENDING_TASK_ID_TO_REQUEST_ID, SingularityAuthorizationScope.READ)
.stream()
.sorted()
.collect(Collectors.toList());
}

private SingularityPendingTaskId getPendingTaskIdFromStr(String pendingTaskIdStr) {
Expand Down
50 changes: 47 additions & 3 deletions ...rityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import com.hubspot.singularity.SingularityPendingRequest;
import com.hubspot.singularity.SingularityPendingRequest.PendingType;
import com.hubspot.singularity.SingularityPendingRequestBuilder;
import com.hubspot.singularity.SingularityPendingTask;
import com.hubspot.singularity.SingularityPendingTaskId;
import com.hubspot.singularity.SingularityRequest;
import com.hubspot.singularity.SingularityRequestDeployState;
Expand Down Expand Up @@ -185,7 +186,9 @@ private void checkDeploy(final SingularityPendingDeploy pendingDeploy, final Lis

if (deployResult.getDeployState() == DeployState.SUCCEEDED) {
if (saveNewDeployState(pendingDeployMarker, Optional.of(pendingDeployMarker))) {
if (!(request.getRequestType() == RequestType.RUN_ONCE)) {
if (request.getRequestType() == RequestType.ON_DEMAND) {
deleteOrRecreatePendingTasks(pendingDeploy);
} else if (request.getRequestType() != RequestType.RUN_ONCE) {
deleteObsoletePendingTasks(pendingDeploy);
}
finishDeploy(requestWithState, deploy, pendingDeploy, allOtherMatchingTasks, deployResult);
Expand All @@ -205,10 +208,51 @@ private void checkDeploy(final SingularityPendingDeploy pendingDeploy, final Lis
finishDeploy(requestWithState, deploy, pendingDeploy, deployMatchingTasks, deployResult);
}

private void deleteOrRecreatePendingTasks(SingularityPendingDeploy pendingDeploy) {
List<SingularityPendingTaskId> obsoletePendingTasks = new ArrayList<>();

taskManager.getPendingTaskIdsForRequest(pendingDeploy.getDeployMarker().getRequestId()).forEach((taskId) -> {
if (!taskId.getDeployId().equals(pendingDeploy.getDeployMarker().getDeployId())) {
if (taskId.getPendingType() == PendingType.ONEOFF) {
Optional<SingularityPendingTask> maybePendingTask = taskManager.getPendingTask(taskId);
if (maybePendingTask.isPresent()) {
// Reschedule any user-initiated pending tasks under the new deploy
SingularityPendingTask pendingTask = maybePendingTask.get();
requestManager.addToPendingQueue(new SingularityPendingRequest(
pendingTask.getPendingTaskId().getRequestId(),
pendingDeploy.getDeployMarker().getDeployId(),
System.currentTimeMillis(),
pendingTask.getUser(),
pendingTask.getPendingTaskId().getPendingType(),
pendingTask.getCmdLineArgsList(),
pendingTask.getRunId(),
pendingTask.getSkipHealthchecks(),
pendingTask.getMessage(),
pendingTask.getActionId(),
pendingTask.getResources(),
pendingTask.getS3UploaderAdditionalFiles(),
pendingTask.getRunAsUserOverride(),
pendingTask.getEnvOverrides(),
pendingTask.getRequiredSlaveAttributeOverrides(),
pendingTask.getAllowedSlaveAttributeOverrides(),
pendingTask.getExtraArtifacts(),
Optional.of(pendingTask.getPendingTaskId().getNextRunAt())
));
}
}
obsoletePendingTasks.add(taskId);
}
});

for (SingularityPendingTaskId pendingTaskId : obsoletePendingTasks) {
LOG.debug("Deleting obsolete pending task {}", pendingTaskId.getId());
taskManager.deletePendingTask(pendingTaskId);
}
}

private void deleteObsoletePendingTasks(SingularityPendingDeploy pendingDeploy) {
List<SingularityPendingTaskId> obsoletePendingTasks = taskManager.getPendingTaskIds()
List<SingularityPendingTaskId> obsoletePendingTasks = taskManager.getPendingTaskIdsForRequest(pendingDeploy.getDeployMarker().getRequestId())
.stream()
.filter(taskId -> taskId.getRequestId().equals(pendingDeploy.getDeployMarker().getRequestId()))
.filter(taskId -> !taskId.getDeployId().equals(pendingDeploy.getDeployMarker().getDeployId()))
.collect(Collectors.toList());

Expand Down
34 changes: 34 additions & 0 deletions ...larityService/src/test/java/com/hubspot/singularity/scheduler/SingularityDeploysTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -79,6 +80,39 @@ public void testDeployManagerHandlesFailedLBTask() {
Assertions.assertTrue(pendingTasks.get(0).getPendingTaskId().getDeployId().equals(firstDeployId));
}

@Test
public void testOnDemandGetsRescheduledWithNewDeploy() {
initOnDemandRequest();
initFirstDeploy();

SingularityRunNowRequest runNowRequest = new SingularityRunNowRequest(
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Collections.emptyList(),
Optional.empty(),
Collections.emptyMap(),
Collections.emptyMap(),
Collections.emptyMap(),
Collections.emptyList(),
Optional.of(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5))
);

requestResource.scheduleImmediately(singularityUser, requestId, runNowRequest);
scheduler.drainPendingQueue();
Assertions.assertEquals(runNowRequest.getRunAt().get(), taskManager.getPendingTaskIds().get(0).getNextRunAt());
Assertions.assertEquals(firstDeployId, taskManager.getPendingTaskIds().get(0).getDeployId());

initSecondDeploy();
deployChecker.checkDeploys();
Assertions.assertEquals(secondDeployId, deployManager.getActiveDeployId(requestId).get());
scheduler.drainPendingQueue();
Assertions.assertEquals(runNowRequest.getRunAt().get(), taskManager.getPendingTaskIds().get(0).getNextRunAt());
Assertions.assertEquals(secondDeployId, taskManager.getPendingTaskIds().get(0).getDeployId());
}

@Test
public void testMissingDeployIsEventuallyReconciled() {
try {
Expand Down