Skip to content

HDFS-16702. MiniDFSCluster should report cause of exception in assertion error #4671

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

Closed
virajjasani wants to merge 3 commits into from
Closed

HDFS-16702. MiniDFSCluster should report cause of exception in assertion error #4671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00eacc4
HDFS-16702. MiniDFSCluster should report cause of exception in assert…
virajjasani Aug 2, 2022
d4e5d9a
Revert "HDFS-16702. MiniDFSCluster should report cause of exception i…
virajjasani Aug 3, 2022
48302ed
addressing review - remove ExitUtil changes
virajjasani Aug 3, 2022
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
14 changes: 12 additions & 2 deletions hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ public String toString() {
if (message == null) {
message = super.toString();
}
return Integer.toString(status) + ": " + message;
String finalString = status + ": " + message;
Throwable cause = getCause();
if (cause != null) {
finalString = finalString + " : \n" + "cause: " + cause.getMessage();
}
return finalString;
Copy link
Member

@ayushtkn ayushtkn Aug 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we changing the response string, I am not sure about the compatibility here.
The above javadoc says

String value does not include exception type, just exit code and message.

We shouldn't make prod level API changes for MiniDFSCluster

Copy link
Contributor Author

@virajjasani virajjasani Aug 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just exit code and message

In a way, we are just improving the message by also including cause message if any cause is associated. I just thought it would be good improvement. We are still not including exception type even with this patch as the Javadoc claims. Only if we print the cause itself, then we would have included exception type. WDYT?

Copy link
Contributor Author

@virajjasani virajjasani Aug 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if you still think we should not include cause.getMessage() in addition to this.getMessage(), I can remove it. It's just that we would be able to include one more layer of message to the existing message if we can include cause.getMessage() as well, just a minor improvement.

}
}

Expand Down Expand Up @@ -139,7 +144,12 @@ public String toString() {
if (message == null) {
message = super.toString();
}
return Integer.toString(status) + ": " + message;
String finalString = status + ": " + message;
Throwable cause = getCause();
if (cause != null) {
finalString = finalString + " : \n" + "cause: " + cause.getMessage();
}
return finalString;
}

}
Expand Down
6 changes: 3 additions & 3 deletions hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2159,10 +2159,10 @@ public void shutdown(boolean deleteDfsDir, boolean closeFileSystem) {
LOG.info("Shutting down the Mini HDFS Cluster");
if (checkExitOnShutdown) {
if (ExitUtil.terminateCalled()) {
LOG.error("Test resulted in an unexpected exit",
ExitUtil.getFirstExitException());
ExitUtil.ExitException exitException = ExitUtil.getFirstExitException();
LOG.error("Test resulted in an unexpected exit", exitException);
ExitUtil.resetFirstExitException();
throw new AssertionError("Test resulted in an unexpected exit");
throw new AssertionError("Test resulted in an unexpected exit", exitException);
}
}
if (closeFileSystem) {
Expand Down