Skip to content
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

Jump to bottom

Bounce deny #766

Merged
merged 5 commits into from
Dec 4, 2015
Merged

Bounce deny #766

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef1927d
do not allow a bounce if we do not have enough slaves to bounce
ssalinas Nov 18, 2015
429ff57
only count slaves if we need to
ssalinas Nov 18, 2015
126d00a
clarify messaging
ssalinas Nov 18, 2015
fd9cab0
typo...
ssalinas Nov 18, 2015
6f43bc3
add da .
ssalinas Nov 18, 2015
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
17 changes: 16 additions & 1 deletion SingularityService/src/main/java/com/hubspot/singularity/resources/RequestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.hubspot.jackson.jaxrs.PropertyFiltering;
import com.hubspot.singularity.MachineState;
import com.hubspot.singularity.RequestState;
import com.hubspot.singularity.SingularityAuthorizationScope;
import com.hubspot.singularity.SingularityCreateResult;
Expand All @@ -45,11 +46,14 @@
import com.hubspot.singularity.SingularityService;
import com.hubspot.singularity.SingularityTransformHelpers;
import com.hubspot.singularity.SingularityUser;
import com.hubspot.singularity.SlavePlacement;
import com.hubspot.singularity.api.SingularityPauseRequest;
import com.hubspot.singularity.auth.SingularityAuthorizationHelper;
import com.hubspot.singularity.config.SingularityConfiguration;
import com.hubspot.singularity.data.DeployManager;
import com.hubspot.singularity.data.RequestManager;
import com.hubspot.singularity.data.SingularityValidator;
import com.hubspot.singularity.data.SlaveManager;
import com.hubspot.singularity.data.TaskManager;
import com.hubspot.singularity.smtp.SingularityMailer;
import com.wordnik.swagger.annotations.Api;
Expand All @@ -66,13 +70,17 @@ public class RequestResource extends AbstractRequestResource {

private final SingularityMailer mailer;
private final TaskManager taskManager;
private final SlaveManager slaveManager;
private final SingularityConfiguration configuration;

@Inject
public RequestResource(SingularityValidator validator, DeployManager deployManager, TaskManager taskManager, RequestManager requestManager, SingularityMailer mailer, SingularityAuthorizationHelper authorizationHelper, Optional<SingularityUser> user) {
public RequestResource(SingularityValidator validator, DeployManager deployManager, TaskManager taskManager, RequestManager requestManager, SingularityMailer mailer, SingularityAuthorizationHelper authorizationHelper, Optional<SingularityUser> user, SlaveManager slaveManager, SingularityConfiguration configuration) {
super(requestManager, deployManager, user, validator, authorizationHelper);

this.mailer = mailer;
this.taskManager = taskManager;
this.slaveManager = slaveManager;
this.configuration = configuration;
}

private static class SingularityRequestDeployHolder {
Expand Down Expand Up @@ -197,6 +205,13 @@ public SingularityRequestParent bounce(@ApiParam("The request ID to bounce") @Pa

checkConflict(requestWithState.getState() != RequestState.PAUSED, "Request %s is paused. Unable to bounce (it must be manually unpaused first)", requestWithState.getRequest().getId());

SlavePlacement placement = requestWithState.getRequest().getSlavePlacement().or(configuration.getDefaultSlavePlacement());
if (placement != SlavePlacement.GREEDY && placement != SlavePlacement.OPTIMISTIC) {
int currentActiveSlaveCount = slaveManager.getNumObjectsAtState(MachineState.ACTIVE);
int requiredSlaveCount = requestWithState.getRequest().getInstancesSafe() * 2;
checkBadRequest(currentActiveSlaveCount >= requiredSlaveCount, "Not enough slaves to successfully complete a bounce of reqeust %s (minimum required: %s, current: %s)", requestId, requiredSlaveCount, currentActiveSlaveCount);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you clarify this to Not enough active slaves... and maybe include guidance to consider deploying instead of bouncing or changing the slave placement?

}

SingularityCreateResult createResult = requestManager.createCleanupRequest(
new SingularityRequestCleanup(queryUser, RequestCleanupType.BOUNCE, System.currentTimeMillis(), Optional.<Boolean>absent(), requestId, Optional.of(getAndCheckDeployId(requestId))));

Expand Down