This is an automated email from the ASF dual-hosted git repository. trohrmann pushed a commit to branch release-1.12 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 27ee325fa1e59fd743085b4ce4f3cbfa71a5bc5a Author: Till Rohrmann <[email protected]> AuthorDate: Fri Nov 27 12:50:00 2020 +0100 [hotfix] Expose FatalExitExceptionHandler's exit code via EXIT_CODE --- .../java/org/apache/flink/runtime/util/FatalExitExceptionHandler.java | 3 ++- .../org/apache/flink/runtime/jobmaster/JobMasterSchedulerTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/FatalExitExceptionHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/FatalExitExceptionHandler.java index b0851b4..aa8e712 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/FatalExitExceptionHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/FatalExitExceptionHandler.java @@ -32,6 +32,7 @@ public final class FatalExitExceptionHandler implements Thread.UncaughtException private static final Logger LOG = LoggerFactory.getLogger(FatalExitExceptionHandler.class); public static final FatalExitExceptionHandler INSTANCE = new FatalExitExceptionHandler(); + public static final int EXIT_CODE = -17; @Override @SuppressWarnings("finally") @@ -40,7 +41,7 @@ public final class FatalExitExceptionHandler implements Thread.UncaughtException LOG.error("FATAL: Thread '{}' produced an uncaught exception. Stopping the process...", t.getName(), e); } finally { - System.exit(-17); + System.exit(EXIT_CODE); } } } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterSchedulerTest.java index e87e1a1..f67cf64 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterSchedulerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterSchedulerTest.java @@ -36,6 +36,7 @@ import org.apache.flink.runtime.scheduler.SchedulerNGFactory; import org.apache.flink.runtime.scheduler.TestingSchedulerNG; import org.apache.flink.runtime.shuffle.ShuffleMaster; import org.apache.flink.runtime.testutils.SystemExitTrackingSecurityManager; +import org.apache.flink.runtime.util.FatalExitExceptionHandler; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.TestLogger; @@ -81,7 +82,7 @@ public class JobMasterSchedulerTest extends TestLogger { try { startFuture.join(); - assertThat(trackingSecurityManager.getSystemExitFuture().join(), is(-17)); + assertThat(trackingSecurityManager.getSystemExitFuture().join(), is(FatalExitExceptionHandler.EXIT_CODE)); } finally { RpcUtils.terminateRpcEndpoint(jobMaster, Time.milliseconds(testingTimeout.toMillis())); System.setSecurityManager(null);
