Skip to content

Commit c2572ad

Browse files
committed
Propagate throwable from fork-join
1 parent 36d9272 commit c2572ad

File tree

1 file changed

+6
-1
lines changed
  • operator/src/main/java/oracle/kubernetes/operator/work

1 file changed

+6
-1
lines changed

operator/src/main/java/oracle/kubernetes/operator/work/Step.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,12 @@ protected final Result doForkJoin(
315315
fiber.addBreadcrumb("[" + ++count + "of" + startDetails.size() + "]");
316316
}
317317

318-
Result r = sap.step().doStepNext(sap.packet());
318+
Packet sapPacket = sap.packet();
319+
Result r = sap.step().doStepNext(sapPacket);
320+
Throwable t = Optional.ofNullable(sapPacket).map(p -> (Throwable) p.getValue(THROWABLE)).orElse(null);
321+
if (t != null) {
322+
return doTerminate(t, packet);
323+
}
319324
if (r != null && r.isRequeue()) {
320325
requeue = true;
321326
duration = minDuration(duration, r.getRequeueAfter());

0 commit comments

Comments
 (0)