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

fix(ecs): Implementing backoff and retry for registerScalableTarget request #6215

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −3
Open

fix(ecs): Implementing backoff and retry for registerScalableTarget request #6215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion .../java/com/netflix/spinnaker/clouddriver/ecs/deploy/ops/DisableServiceAtomicOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.amazonaws.services.ecs.AmazonECS;
import com.amazonaws.services.ecs.model.UpdateServiceRequest;
import com.netflix.spinnaker.clouddriver.ecs.deploy.description.ModifyServiceDescription;
import com.netflix.spinnaker.clouddriver.helpers.OperationPoller;
import java.util.List;

public class DisableServiceAtomicOperation
Expand Down Expand Up @@ -70,7 +71,9 @@ private void disableService() {
.withDynamicScalingInSuspended(true)
.withDynamicScalingOutSuspended(true)
.withScheduledScalingSuspended(true));
autoScalingClient.registerScalableTarget(suspendRequest);

OperationPoller.retryWithBackoff(
o -> autoScalingClient.registerScalableTarget(suspendRequest), 1000, 3);
updateTaskStatus(
String.format("Autoscaling on server group %s suspended for %s.", service, account));
}
Expand Down
5 changes: 4 additions & 1 deletion ...n/java/com/netflix/spinnaker/clouddriver/ecs/deploy/ops/EnableServiceAtomicOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.amazonaws.services.ecs.AmazonECS;
import com.amazonaws.services.ecs.model.UpdateServiceRequest;
import com.netflix.spinnaker.clouddriver.ecs.deploy.description.ModifyServiceDescription;
import com.netflix.spinnaker.clouddriver.helpers.OperationPoller;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -68,7 +69,9 @@ private void enableService() {
.withDynamicScalingInSuspended(false)
.withDynamicScalingOutSuspended(false)
.withScheduledScalingSuspended(false));
autoScalingClient.registerScalableTarget(resumeRequest);

OperationPoller.retryWithBackoff(
o -> autoScalingClient.registerScalableTarget(resumeRequest), 1000, 3);
updateTaskStatus(
String.format("Autoscaling on server group %s resumed for %s.", service, account));
}
Expand Down
6 changes: 5 additions & 1 deletion ...n/java/com/netflix/spinnaker/clouddriver/ecs/deploy/ops/ResizeServiceAtomicOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.amazonaws.services.ecs.model.UpdateServiceRequest;
import com.netflix.spinnaker.clouddriver.ecs.deploy.description.ResizeServiceDescription;
import com.netflix.spinnaker.clouddriver.ecs.services.ContainerInformationService;
import com.netflix.spinnaker.clouddriver.helpers.OperationPoller;
import com.netflix.spinnaker.clouddriver.orchestration.AtomicOperation;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -89,7 +90,10 @@ private void resizeAutoScalingGroup(Service service) {
String.format(
"Resizing Scalable Target of %s to %s instances",
service.getServiceName(), desiredCount));
autoScalingClient.registerScalableTarget(request);

OperationPoller.retryWithBackoff(
o -> autoScalingClient.registerScalableTarget(request), 1000, 3);

updateTaskStatus(
String.format(
"Done resizing Scalable Target of %s to %s instances",
Expand Down
Loading