Skip to content

HDDS-2206. Separate handling for OMException and IOException in the Ozone Manager. Contributed by Supratim Deka #12

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

Merged
bharatviswa504 merged 5 commits into from
Oct 21, 2019
Merged

HDDS-2206. Separate handling for OMException and IOException in the Ozone Manager. Contributed by Supratim Deka #12

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac3040f
HDDS-2206. Separate handling for OMException and IOException in the O…
Oct 10, 2019
5fff037
addressed review comments.
Oct 15, 2019
9a1f441
Revert "addressed review comments."
Oct 17, 2019
4e65849
Revert "HDDS-2206. Separate handling for OMException and IOException …
Oct 17, 2019
1d9dc03
removed config. propagate stacktrace inside error message.
Oct 17, 2019
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
15 changes: 13 additions & 2 deletions ...n/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.NotLeaderException;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB;
import org.apache.hadoop.ozone.om.ratis.OzoneManagerDoubleBuffer;
import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServer;
Expand All @@ -34,6 +35,7 @@

import com.google.protobuf.RpcController;
import com.google.protobuf.ServiceException;
import org.apache.hadoop.util.StringUtils;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.util.ExitUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -153,12 +155,21 @@ private OMResponse createErrorResponse(
OzoneManagerRatisUtils.exceptionToResponseStatus(exception))
.setCmdType(cmdType)
.setSuccess(false);
if (exception.getMessage() != null) {
omResponse.setMessage(exception.getMessage());
String errorMsg = exceptionErrorMessage(exception);
if (errorMsg != null) {
omResponse.setMessage(errorMsg);
}
return omResponse.build();
}

private String exceptionErrorMessage(IOException ex) {
if (ex instanceof OMException) {
return ex.getMessage();
} else {
return StringUtils.stringifyException(ex);
}
}

/**
* Submits request to OM's Ratis server.
*/
Expand Down