You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by je...@apache.org on 2013/05/24 00:21:57 UTC
svn commit: r1485877 -
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
Author: jeagles
Date: Thu May 23 22:21:56 2013
New Revision: 1485877
URL: http://svn.apache.org/r1485877
Log:
YARN-548. Add tests for YarnUncaughtExceptionHandler (Vadim Bondarev via jeagles)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java?rev=1485877&r1=1485876&r2=1485877&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java Thu May 23 22:21:56 2013
@@ -30,7 +30,9 @@ import org.apache.hadoop.classification.
public final class ExitUtil {
private final static Log LOG = LogFactory.getLog(ExitUtil.class.getName());
private static volatile boolean systemExitDisabled = false;
+ private static volatile boolean systemHaltDisabled = false;
private static volatile ExitException firstExitException;
+ private static volatile HaltException firstHaltException;
public static class ExitException extends RuntimeException {
private static final long serialVersionUID = 1L;
@@ -42,6 +44,16 @@ public final class ExitUtil {
}
}
+ public static class HaltException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+ public final int status;
+
+ public HaltException(int status, String msg) {
+ super(msg);
+ this.status = status;
+ }
+ }
+
/**
* Disable the use of System.exit for testing.
*/
@@ -50,6 +62,13 @@ public final class ExitUtil {
}
/**
+ * Disable the use of {@code Runtime.getRuntime().halt() } for testing.
+ */
+ public static void disableSystemHalt() {
+ systemHaltDisabled = true;
+ }
+
+ /**
* @return true if terminate has been called
*/
public static boolean terminateCalled() {
@@ -58,6 +77,13 @@ public final class ExitUtil {
}
/**
+ * @return true if halt has been called
+ */
+ public static boolean haltCalled() {
+ return firstHaltException != null;
+ }
+
+ /**
* @return the first ExitException thrown, null if none thrown yet
*/
public static ExitException getFirstExitException() {
@@ -65,20 +91,34 @@ public final class ExitUtil {
}
/**
- * Reset the tracking of process termination. This is for use
- * in unit tests where one test in the suite expects an exit
- * but others do not.
+ * @return the first {@code HaltException} thrown, null if none thrown yet
+ */
+ public static HaltException getFirstHaltException() {
+ return firstHaltException;
+ }
+
+ /**
+ * Reset the tracking of process termination. This is for use in unit tests
+ * where one test in the suite expects an exit but others do not.
*/
public static void resetFirstExitException() {
firstExitException = null;
}
+ public static void resetFirstHaltException() {
+ firstHaltException = null;
+ }
+
/**
* Terminate the current process. Note that terminate is the *only* method
* that should be used to terminate the daemon processes.
- * @param status exit code
- * @param msg message used to create the ExitException
- * @throws ExitException if System.exit is disabled for test purposes
+ *
+ * @param status
+ * exit code
+ * @param msg
+ * message used to create the {@code ExitException}
+ * @throws ExitException
+ * if System.exit is disabled for test purposes
*/
public static void terminate(int status, String msg) throws ExitException {
LOG.info("Exiting with status " + status);
@@ -94,22 +134,70 @@ public final class ExitUtil {
}
/**
+ * Forcibly terminates the currently running Java virtual machine.
+ *
+ * @param status
+ * exit code
+ * @param msg
+ * message used to create the {@code HaltException}
+ * @throws HaltException
+ * if Runtime.getRuntime().halt() is disabled for test purposes
+ */
+ public static void halt(int status, String msg) throws HaltException {
+ LOG.info("Halt with status " + status + " Message: " + msg);
+ if (systemHaltDisabled) {
+ HaltException ee = new HaltException(status, msg);
+ LOG.fatal("Halt called", ee);
+ if (null == firstHaltException) {
+ firstHaltException = ee;
+ }
+ throw ee;
+ }
+ Runtime.getRuntime().halt(status);
+ }
+
+ /**
* Like {@link terminate(int, String)} but uses the given throwable to
* initialize the ExitException.
+ *
* @param status
- * @param t throwable used to create the ExitException
- * @throws ExitException if System.exit is disabled for test purposes
+ * @param t
+ * throwable used to create the ExitException
+ * @throws ExitException
+ * if System.exit is disabled for test purposes
*/
public static void terminate(int status, Throwable t) throws ExitException {
terminate(status, StringUtils.stringifyException(t));
}
/**
+ * Forcibly terminates the currently running Java virtual machine.
+ *
+ * @param status
+ * @param t
+ * @throws ExitException
+ */
+ public static void halt(int status, Throwable t) throws HaltException {
+ halt(status, StringUtils.stringifyException(t));
+ }
+
+ /**
* Like {@link terminate(int, String)} without a message.
+ *
* @param status
- * @throws ExitException if System.exit is disabled for test purposes
+ * @throws ExitException
+ * if System.exit is disabled for test purposes
*/
public static void terminate(int status) throws ExitException {
terminate(status, "ExitException");
}
+
+ /**
+ * Forcibly terminates the currently running Java virtual machine.
+ * @param status
+ * @throws ExitException
+ */
+ public static void halt(int status) throws HaltException {
+ halt(status, "HaltException");
+ }
}