Skip to content

Added delay capability to retry step #153

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

Open
JoaoPPinto wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Added delay capability to retry step #153

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d393f1b
Added delay capability to retry
krotte1 Sep 22, 2019
6532030
Adding documentation for the new variables
krotte1 Sep 22, 2019
b4e80a9
Fixed links in variable comments
krotte1 Sep 22, 2019
ef38438
Made updates based on findbugs scan
krotte1 Sep 22, 2019
2e35b88
Making update to trigger build
krotte1 Sep 24, 2019
d87835b
Initial update to incorporate extensible retry rate model
krotte1 Sep 27, 2019
ce5e211
fixed unit tests and related classes
krotte1 Sep 29, 2019
c6ea76c
Removed tests that were moved to RetryStepDelayTest
krotte1 Sep 29, 2019
9bf2e30
Fixed test script so it calls the correct RetryDelay
krotte1 Sep 29, 2019
bbf120a
removed useRetryDelay variable
JoaoPPinto Aug 24, 2021
35933b9
updated ExponentialDelay and RandomExponentialDelay javadocs
JoaoPPinto Aug 24, 2021
773c708
fix findbugs warnings in ExponentialDelay, RandomDelay and RandomExpo…
JoaoPPinto Aug 24, 2021
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
Prev Previous commit
Next Next commit
Made updates based on findbugs scan
  • Loading branch information
@krotte1 @JoaoPPinto
krotte1 authored and JoaoPPinto committed Aug 24, 2021
commit ef38438b5bdc99f47507c6a6937e365fd2cdb708
19 changes: 13 additions & 6 deletions src/main/java/org/jenkinsci/plugins/workflow/steps/RetryStepExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.jenkinsci.plugins.workflow.steps;


import com.google.common.base.Function;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.AbortException;
import hudson.Functions;
Expand All @@ -13,8 +15,6 @@
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;

import com.google.common.base.Function;

import jenkins.util.Timer;

/**
Expand All @@ -24,6 +24,7 @@ public class RetryStepExecution extends AbstractStepExecutionImpl {

@SuppressFBWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", justification = "Only used when starting.")
private transient final RetryStep step;
@SuppressFBWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", justification = "Only used when starting.")
private transient final int count;
private transient volatile ScheduledFuture<?> task;

Expand Down Expand Up @@ -163,9 +164,15 @@ public void onFailure(StepContext context, Throwable t) {
context.onFailure(t);
return;
}
left--;
step.left--;
if ((left>0) || (step != null && step.left>0)) {
int remaining = 0;
if(step != null) {
step.left--;
remaining = step.left;
} else {
left--;
remaining = left;
}
if (remaining>0) {
TaskListener l = context.get(TaskListener.class);
if (t instanceof AbortException) {
l.error(t.getMessage());
Expand All @@ -175,7 +182,7 @@ public void onFailure(StepContext context, Throwable t) {
} else {
Functions.printStackTrace(t, l.error("Execution failed"));
}
if(step == null || !step.isUseTimeDelay()) {
if(step != null && !step.isUseTimeDelay()) {
l.getLogger().println("Retrying");
context.newBodyInvoker().withCallback(this).start();
} else {
Expand Down