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

Avoid printing warnings from CpsStepContext.completed #490

Merged
merged 3 commits into from
Dec 17, 2021
Merged

Avoid printing warnings from CpsStepContext.completed #490

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2612b17
Avoid printing warnings from `CpsStepContext.completed`
jglick Dec 1, 2021
d270172
Merge branch 'master' of https://github.com/jenkinsci/workflow-cps-pl…
jglick Dec 3, 2021
8c697a4
https://github.com/jenkinsci/workflow-cps-plugin/pull/490#issuecommen…
jglick Dec 3, 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
27 changes: 11 additions & 16 deletions src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,29 +327,20 @@ private void completed(@Nonnull Outcome newOutcome) {
whenOutcomeDelivered = new Throwable();
} else {
Throwable failure = newOutcome.getAbnormal();
if (failure instanceof FlowInterruptedException) {
for (CauseOfInterruption cause : ((FlowInterruptedException) failure).getCauses()) {
if (cause instanceof BodyFailed) {
LOGGER.log(Level.FINE, "already completed " + this + " and now received body failure", failure);
// Predictable that the error would be thrown up here; quietly ignore it.
return;
}
}
}
LOGGER.log(Level.WARNING, "already completed " + this, new IllegalStateException("delivered here"));
LOGGER.log(Level.FINE, "already completed " + this, new IllegalStateException("delivered here"));
if (failure != null) {
LOGGER.log(Level.INFO, "new failure", failure);
LOGGER.log(Level.FINE, "new failure", failure);
} else {
LOGGER.log(Level.INFO, "new success: {0}", outcome.getNormal());
LOGGER.log(Level.FINE, "new success: {0}", outcome.getNormal());
}
if (whenOutcomeDelivered != null) {
LOGGER.log(Level.INFO, "previously delivered here", whenOutcomeDelivered);
LOGGER.log(Level.FINE, "previously delivered here", whenOutcomeDelivered);
}
failure = outcome.getAbnormal();
if (failure != null) {
LOGGER.log(Level.INFO, "earlier failure", failure);
LOGGER.log(Level.FINE, "earlier failure", failure);
} else {
LOGGER.log(Level.INFO, "earlier success: {0}", outcome.getNormal());
LOGGER.log(Level.FINE, "earlier success: {0}", outcome.getNormal());
}
}
}
Expand Down Expand Up @@ -398,7 +389,7 @@ public void onSuccess(CpsThreadGroup g) {
if (s != null) {
// TODO: ideally this needs to work like interrupt, in that
// if s==null the next StepExecution gets interrupted when it happen
FlowInterruptedException cause = new FlowInterruptedException(Result.FAILURE, new BodyFailed());
FlowInterruptedException cause = new FlowInterruptedException(Result.FAILURE);
cause.initCause(getOutcome().getAbnormal());
try {
// TODO JENKINS-26148/JENKINS-34637 this is probably wrong: should interrupt the innermost execution
Expand Down Expand Up @@ -456,6 +447,10 @@ private static final class AlreadyCompleted extends AssertionError {
}
}

/**
* @deprecated No longer used, but retained for settings compatibility.
*/
@Deprecated
private static class BodyFailed extends CauseOfInterruption {
@Override public String getShortDescription() {
return "Body of block-scoped step failed";
Expand Down