Skip to content

HDDS-4542. Need throw exception to trigger FailoverProxyProvider of SCM client to work #1652

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
ChenSammi merged 1 commit into from
Dec 4, 2020
Merged

HDDS-4542. Need throw exception to trigger FailoverProxyProvider of SCM client to work #1652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions ...a/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,7 @@ private boolean isLeader() throws ServiceException {
public SCMBlockLocationResponse send(RpcController controller,
SCMBlockLocationRequest request) throws ServiceException {
if (!isLeader()) {
SCMBlockLocationResponse.Builder response = createSCMBlockResponse(
request.getCmdType(),
request.getTraceID());
response.setSuccess(false);
response.setStatus(Status.SCM_NOT_LEADER);
response.setLeaderSCMNodeId(null);
return response.build();
throw new ServiceException(new IOException("SCM IS NOT LEADER"));
}
return dispatcher.processRequest(
request,
Expand Down
4 changes: 1 addition & 3 deletions ...ache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,7 @@ private boolean isLeader() throws ServiceException {
public ScmContainerLocationResponse submitRequest(RpcController controller,
ScmContainerLocationRequest request) throws ServiceException {
if (!isLeader()) {
return ScmContainerLocationResponse.newBuilder()
.setCmdType(request.getCmdType()).setTraceID(request.getTraceID())
.setSuccess(false).setStatus(Status.SCM_NOT_LEADER).build();
throw new ServiceException(new IOException("SCM IS NOT LEADER"));
Copy link
Contributor

@timmylicheng timmylicheng Dec 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Shall we expose scm names or ipadress for the current SCM in the exception message?

Copy link
Contributor Author

@GlenGeng-awx GlenGeng-awx Dec 3, 2020

Choose a reason for hiding this comment

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

@timmylicheng Thanks for looking at this patch !

Good point !
As far as I know, the failover proxy provider will print out the IP address, along with the exception.

We need revisit this code in future, when the failover proxy provider should support leaderHint. I've file a jira to track this task, https://issues.apache.org/jira/browse/HDDS-4545

}
return dispatcher
.processRequest(request, this::processRequest, request.getCmdType(),
Expand Down