Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1433. Rename GetScmInfoRespsonseProto to GetScmInfoResponseProto due to typos. Contributed by Wanqiang Ji.

This commit is contained in:
Márton Elek 2019-04-18 08:45:50 +02:00
parent aa4c744aef
commit 8aea5e4cb6
No known key found for this signature in database
GPG Key ID: D51EA8F00EE79B28
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
View File

@ -190,7 +190,7 @@ private String useFirstLine(String message) {
public ScmInfo getScmInfo() throws IOException { public ScmInfo getScmInfo() throws IOException {
HddsProtos.GetScmInfoRequestProto request = HddsProtos.GetScmInfoRequestProto request =
HddsProtos.GetScmInfoRequestProto.getDefaultInstance(); HddsProtos.GetScmInfoRequestProto.getDefaultInstance();
HddsProtos.GetScmInfoRespsonseProto resp; HddsProtos.GetScmInfoResponseProto resp;
try { try {
resp = rpcProxy.getScmInfo(NULL_RPC_CONTROLLER, request); resp = rpcProxy.getScmInfo(NULL_RPC_CONTROLLER, request);
} catch (ServiceException e) { } catch (ServiceException e) {

2
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
View File

@ -357,7 +357,7 @@ public ScmInfo getScmInfo() throws IOException {
.setTraceID(TracingUtil.exportCurrentSpan()) .setTraceID(TracingUtil.exportCurrentSpan())
.build(); .build();
try { try {
HddsProtos.GetScmInfoRespsonseProto resp = rpcProxy.getScmInfo( HddsProtos.GetScmInfoResponseProto resp = rpcProxy.getScmInfo(
NULL_RPC_CONTROLLER, request); NULL_RPC_CONTROLLER, request);
ScmInfo.Builder builder = new ScmInfo.Builder() ScmInfo.Builder builder = new ScmInfo.Builder()
.setClusterId(resp.getClusterId()) .setClusterId(resp.getClusterId())

4
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java
View File

@ -133,7 +133,7 @@ public DeleteScmKeyBlocksResponseProto deleteScmKeyBlocks(
} }
@Override @Override
public HddsProtos.GetScmInfoRespsonseProto getScmInfo( public HddsProtos.GetScmInfoResponseProto getScmInfo(
RpcController controller, HddsProtos.GetScmInfoRequestProto req) RpcController controller, HddsProtos.GetScmInfoRequestProto req)
throws ServiceException { throws ServiceException {
ScmInfo scmInfo; ScmInfo scmInfo;
@ -142,7 +142,7 @@ public HddsProtos.GetScmInfoRespsonseProto getScmInfo(
} catch (IOException ex) { } catch (IOException ex) {
throw new ServiceException(ex); throw new ServiceException(ex);
} }
return HddsProtos.GetScmInfoRespsonseProto.newBuilder() return HddsProtos.GetScmInfoResponseProto.newBuilder()
.setClusterId(scmInfo.getClusterId()) .setClusterId(scmInfo.getClusterId())
.setScmId(scmInfo.getScmId()) .setScmId(scmInfo.getScmId())
.build(); .build();

4
hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java
View File

@ -265,13 +265,13 @@ public ClosePipelineResponseProto closePipeline(
} }
@Override @Override
public HddsProtos.GetScmInfoRespsonseProto getScmInfo( public HddsProtos.GetScmInfoResponseProto getScmInfo(
RpcController controller, HddsProtos.GetScmInfoRequestProto req) RpcController controller, HddsProtos.GetScmInfoRequestProto req)
throws ServiceException { throws ServiceException {
try (Scope scope = TracingUtil try (Scope scope = TracingUtil
.importAndCreateScope("getScmInfo", req.getTraceID())) { .importAndCreateScope("getScmInfo", req.getTraceID())) {
ScmInfo scmInfo = impl.getScmInfo(); ScmInfo scmInfo = impl.getScmInfo();
return HddsProtos.GetScmInfoRespsonseProto.newBuilder() return HddsProtos.GetScmInfoResponseProto.newBuilder()
.setClusterId(scmInfo.getClusterId()) .setClusterId(scmInfo.getClusterId())
.setScmId(scmInfo.getScmId()) .setScmId(scmInfo.getScmId())
.build(); .build();

2
hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto
View File

@ -138,5 +138,5 @@ service ScmBlockLocationProtocolService {
* Gets the scmInfo from SCM. * Gets the scmInfo from SCM.
*/ */
rpc getScmInfo(hadoop.hdds.GetScmInfoRequestProto) rpc getScmInfo(hadoop.hdds.GetScmInfoRequestProto)
returns (hadoop.hdds.GetScmInfoRespsonseProto); returns (hadoop.hdds.GetScmInfoResponseProto);
} }

2
hadoop-hdds/common/src/main/proto/StorageContainerLocationProtocol.proto
View File

@ -262,7 +262,7 @@ service StorageContainerLocationProtocolService {
* Returns information about SCM. * Returns information about SCM.
*/ */
rpc getScmInfo(GetScmInfoRequestProto) rpc getScmInfo(GetScmInfoRequestProto)
returns (GetScmInfoRespsonseProto); returns (GetScmInfoResponseProto);
/** /**
* Checks if SCM is in SafeMode. * Checks if SCM is in SafeMode.

6
hadoop-hdds/common/src/main/proto/hdds.proto
View File

@ -169,7 +169,7 @@ message GetScmInfoRequestProto {
optional string traceID = 1; optional string traceID = 1;
} }
message GetScmInfoRespsonseProto { message GetScmInfoResponseProto {
required string clusterId = 1; required string clusterId = 1;
required string scmId = 2; required string scmId = 2;
} }
@ -222,8 +222,8 @@ message ContainerBlockID {
*/ */
message BlockTokenSecretProto { message BlockTokenSecretProto {
/** /**
* File access permissions mode. * File access permissions mode.
*/ */
enum AccessModeProto { enum AccessModeProto {
READ = 1; READ = 1;
WRITE = 2; WRITE = 2;