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 all commits
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
47 changes: 27 additions & 20 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 @@ -30,6 +30,7 @@
import com.google.common.util.concurrent.SettableFuture;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import groovy.lang.Closure;
import hudson.Main;
import hudson.model.Descriptor;
import hudson.model.Result;
import hudson.util.DaemonThreadFactory;
Expand Down Expand Up @@ -327,29 +328,35 @@ 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;
}
Level level;
if (Main.isUnitTest) {
if (failure instanceof FlowInterruptedException && ((FlowInterruptedException) failure).getCauses().stream().anyMatch(BodyFailed.class::isInstance)) {
// Very common and generally uninteresting.
level = Level.FINE;
} else {
// Possibly a minor bug.
level = Level.INFO;
}
}
LOGGER.log(Level.WARNING, "already completed " + this, new IllegalStateException("delivered here"));
if (failure != null) {
LOGGER.log(Level.INFO, "new failure", failure);
} else {
LOGGER.log(Level.INFO, "new success: {0}", outcome.getNormal());
// Typically harmless; do not alarm users.
level = Level.FINE;
}
if (whenOutcomeDelivered != null) {
LOGGER.log(Level.INFO, "previously delivered here", whenOutcomeDelivered);
}
failure = outcome.getAbnormal();
if (failure != null) {
LOGGER.log(Level.INFO, "earlier failure", failure);
} else {
LOGGER.log(Level.INFO, "earlier success: {0}", outcome.getNormal());
if (LOGGER.isLoggable(level)) {
LOGGER.log(level, "already completed " + this, new IllegalStateException("delivered here"));
if (failure != null) {
LOGGER.log(level, "new failure", failure);
} else {
LOGGER.log(level, "new success: {0}", outcome.getNormal());
}
if (whenOutcomeDelivered != null) {
LOGGER.log(level, "previously delivered here", whenOutcomeDelivered);
}
Throwable earlierFailure = outcome.getAbnormal();
if (earlierFailure != null) {
LOGGER.log(level, "earlier failure", earlierFailure);
} else {
LOGGER.log(level, "earlier success: {0}", outcome.getNormal());
}
}
}
}
Expand Down