HDFS-16702. MiniDFSCluster should report cause of exception in assert error (#4680)
When the MiniDFSClsuter detects that an exception caused an exit, it should include that exception as the cause for the AssertionError that it throws. The current AssertError simply reports the message "Test resulted in an unexpected exit" and provides a stack trace to the location of the check for an exit exception. This patch adds the original exception as the cause of the AssertError.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 484958e..c4e99b1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -2159,10 +2159,11 @@
LOG.info("Shutting down the Mini HDFS Cluster");
if (checkExitOnShutdown) {
if (ExitUtil.terminateCalled()) {
- LOG.error("Test resulted in an unexpected exit",
- ExitUtil.getFirstExitException());
+ Exception cause = ExitUtil.getFirstExitException();
+ LOG.error("Test resulted in an unexpected exit", cause);
ExitUtil.resetFirstExitException();
- throw new AssertionError("Test resulted in an unexpected exit");
+ throw new AssertionError("Test resulted in an unexpected exit: " +
+ cause.toString(), cause);
}
}
if (closeFileSystem) {
