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

fix(trafficguards): adds retry logic to validateClusterStatus #1759

Merged
merged 1 commit into from
Nov 1, 2017
Merged

fix(trafficguards): adds retry logic to validateClusterStatus #1759

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
10 changes: 8 additions & 2 deletions ...y/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup

import com.netflix.spinnaker.orca.ExecutionStatus
import com.netflix.spinnaker.orca.RetrySupport
import com.netflix.spinnaker.orca.RetryableTask
import com.netflix.spinnaker.orca.TaskResult
import com.netflix.spinnaker.orca.clouddriver.KatoService
Expand All @@ -37,12 +38,15 @@ abstract class AbstractServerGroupTask extends AbstractCloudProviderAwareTask im

@Override
long getTimeout() {
return 60000
return 90000
}

@Autowired
KatoService kato

@Autowired
RetrySupport retrySupport

protected boolean isAddTargetOpOutputs() {
false
}
Expand All @@ -60,7 +64,9 @@ abstract class AbstractServerGroupTask extends AbstractCloudProviderAwareTask im
String account = getCredentials(stage)

def operation = convert(stage)
validateClusterStatus(operation)
retrySupport.retry({
validateClusterStatus(operation)
}, 6, 5000, false) // retry for up to 30 seconds
if (!operation) {
// nothing to do but succeed
return new TaskResult(ExecutionStatus.SUCCEEDED)
Expand Down
7 changes: 6 additions & 1 deletion ...m/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTaskSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup

import com.netflix.spinnaker.orca.ExecutionStatus
import com.netflix.spinnaker.orca.RetrySupport
import com.netflix.spinnaker.orca.clouddriver.KatoService
import com.netflix.spinnaker.orca.clouddriver.model.TaskId
import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroup
Expand All @@ -35,7 +36,11 @@ class AbstractServerGroupTaskSpec extends Specification {
}

@Subject
task = new TestServerGroupTask()
task = new TestServerGroupTask(
retrySupport: Spy(RetrySupport) {
_ * sleep(_) >> { /* do nothing */ }
}
)
def stage = new Stage<>(new Pipeline("orca"), "whatever")
def taskId = new TaskId(UUID.randomUUID().toString())

Expand Down
9 changes: 7 additions & 2 deletions ...om/netflix/spinnaker/orca/clouddriver/tasks/servergroup/DestroyServerGroupTaskSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup

import com.netflix.spinnaker.orca.ExecutionStatus
import com.netflix.spinnaker.orca.RetrySupport
import com.netflix.spinnaker.orca.clouddriver.KatoService
import com.netflix.spinnaker.orca.clouddriver.model.TaskId
import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroup
Expand All @@ -28,9 +29,13 @@ import spock.lang.Specification
import spock.lang.Subject

class DestroyServerGroupTaskSpec extends Specification {
def trafficGuard = Stub(TrafficGuard)
@Subject
task = new DestroyServerGroupTask(trafficGuard: trafficGuard)
task = new DestroyServerGroupTask(
trafficGuard: Stub(TrafficGuard),
retrySupport: Spy(RetrySupport) {
_ * sleep(_) >> { /* do nothing */ }
}
)
def stage = new Stage<>(new Pipeline("orca"), "whatever")
def taskId = new TaskId(UUID.randomUUID().toString())

Expand Down