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.

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

Scale message #1487

Merged
merged 3 commits into from Apr 11, 2017
Merged

Scale message #1487

merged 3 commits into from Apr 11, 2017

Conversation

@darcatron
Copy link
Contributor

darcatron commented Apr 4, 2017

Adds the instance number change to the scale history message.

Also removed user from the bounce after scale message since the user already shows up in the user column

@ssalinas

@@ -102,7 +102,7 @@ private void checkReschedule(SingularityRequest newRequest, Optional<Singularity
System.currentTimeMillis(), Optional.<Boolean> absent(), newRequest.getId(), Optional.of(maybeDeployId.get()), skipHealthchecks, message, actionId, maybeBounceRequest.get().getRunShellCommandBeforeKill()));

if (createResult != SingularityCreateResult.EXISTED) {
requestManager.bounce(newRequest, System.currentTimeMillis(), user, Optional.of(String.format("Bouncing due to bounce after scale by %s", user)));

This comment has been minimized.

Copy link
@ssalinas

ssalinas Apr 6, 2017

Member

why remove the user here?

This comment has been minimized.

Copy link
@darcatron

darcatron Apr 6, 2017

Author Contributor

It's already in the user column so it seemed repetitive

@@ -581,6 +581,12 @@ public SingularityRequestParent scale(@ApiParam("The Request ID to scale") @Path
validator.checkScale(newRequest, Optional.<Integer>absent());

checkBadRequest(oldRequest.getInstancesSafe() != newRequest.getInstancesSafe(), "Scale request has no affect on the # of instances (%s)", newRequest.getInstancesSafe());
String scaleMessage = String.format("Scaling from %d instance(s) to %d instances", oldRequest.getInstancesSafe(), newRequest.getInstancesSafe());

This comment has been minimized.

Copy link
@ssalinas

ssalinas Apr 6, 2017

Member

given the size of the area it is displayed in the ui, this can probably be even shorter. i.e. from %d to %s or even %d -> %d

@ssalinas
Copy link
Member

ssalinas commented Apr 7, 2017

👍

@ssalinas ssalinas added this to the 0.15.0 milestone Apr 11, 2017
@ssalinas ssalinas merged commit 0a5ad0d into master Apr 11, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@ssalinas ssalinas deleted the scale-message branch Apr 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.