This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch HDDS-2823
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2823 by this push:
new 0801203 HDDS-4542. Need throw exception to trigger
FailoverProxyProvider of SCM client to work (#1652)
0801203 is described below
commit 08012034695f4cf3e598859045b7de62a35c9324
Author: GlenGeng <[email protected]>
AuthorDate: Fri Dec 4 15:31:08 2020 +0800
HDDS-4542. Need throw exception to trigger FailoverProxyProvider of SCM
client to work (#1652)
---
.../protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java | 8 +-------
.../StorageContainerLocationProtocolServerSideTranslatorPB.java | 4 +---
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
index cbb64c1..ea6a148 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmBlockLocationProtocolServerSideTranslatorPB.java
@@ -107,13 +107,7 @@ public final class
ScmBlockLocationProtocolServerSideTranslatorPB
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,
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
index b2f6534..aa19cec 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
@@ -133,9 +133,7 @@ public final class
StorageContainerLocationProtocolServerSideTranslatorPB
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"));
}
return dispatcher
.processRequest(request, this::processRequest, request.getCmdType(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
