From 8aea5e4cb6cf76a66daa4b860b69b05beb39f8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Thu, 18 Apr 2019 08:45:50 +0200 Subject: [PATCH] HDDS-1433. Rename GetScmInfoRespsonseProto to GetScmInfoResponseProto due to typos. Contributed by Wanqiang Ji. --- .../ScmBlockLocationProtocolClientSideTranslatorPB.java | 2 +- ...rageContainerLocationProtocolClientSideTranslatorPB.java | 2 +- .../ScmBlockLocationProtocolServerSideTranslatorPB.java | 4 ++-- ...rageContainerLocationProtocolServerSideTranslatorPB.java | 4 ++-- .../common/src/main/proto/ScmBlockLocationProtocol.proto | 2 +- .../src/main/proto/StorageContainerLocationProtocol.proto | 2 +- hadoop-hdds/common/src/main/proto/hdds.proto | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java index 71f9831bc1..559022f286 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java @@ -190,7 +190,7 @@ private String useFirstLine(String message) { public ScmInfo getScmInfo() throws IOException { HddsProtos.GetScmInfoRequestProto request = HddsProtos.GetScmInfoRequestProto.getDefaultInstance(); - HddsProtos.GetScmInfoRespsonseProto resp; + HddsProtos.GetScmInfoResponseProto resp; try { resp = rpcProxy.getScmInfo(NULL_RPC_CONTROLLER, request); } catch (ServiceException e) { diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java index acd446ede3..ffb4686b3d 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java @@ -357,7 +357,7 @@ public ScmInfo getScmInfo() throws IOException { .setTraceID(TracingUtil.exportCurrentSpan()) .build(); try { - HddsProtos.GetScmInfoRespsonseProto resp = rpcProxy.getScmInfo( + HddsProtos.GetScmInfoResponseProto resp = rpcProxy.getScmInfo( NULL_RPC_CONTROLLER, request); ScmInfo.Builder builder = new ScmInfo.Builder() .setClusterId(resp.getClusterId()) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java index 9ff6879573..65f0a973ce 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java @@ -133,7 +133,7 @@ public DeleteScmKeyBlocksResponseProto deleteScmKeyBlocks( } @Override - public HddsProtos.GetScmInfoRespsonseProto getScmInfo( + public HddsProtos.GetScmInfoResponseProto getScmInfo( RpcController controller, HddsProtos.GetScmInfoRequestProto req) throws ServiceException { ScmInfo scmInfo; @@ -142,7 +142,7 @@ public HddsProtos.GetScmInfoRespsonseProto getScmInfo( } catch (IOException ex) { throw new ServiceException(ex); } - return HddsProtos.GetScmInfoRespsonseProto.newBuilder() + return HddsProtos.GetScmInfoResponseProto.newBuilder() .setClusterId(scmInfo.getClusterId()) .setScmId(scmInfo.getScmId()) .build(); diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java index a994ed7ea5..ea96cfa0aa 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java @@ -265,13 +265,13 @@ public ClosePipelineResponseProto closePipeline( } @Override - public HddsProtos.GetScmInfoRespsonseProto getScmInfo( + public HddsProtos.GetScmInfoResponseProto getScmInfo( RpcController controller, HddsProtos.GetScmInfoRequestProto req) throws ServiceException { try (Scope scope = TracingUtil .importAndCreateScope("getScmInfo", req.getTraceID())) { ScmInfo scmInfo = impl.getScmInfo(); - return HddsProtos.GetScmInfoRespsonseProto.newBuilder() + return HddsProtos.GetScmInfoResponseProto.newBuilder() .setClusterId(scmInfo.getClusterId()) .setScmId(scmInfo.getScmId()) .build(); diff --git a/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto b/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto index eebda0a823..6745c6ee14 100644 --- a/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto +++ b/hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto @@ -138,5 +138,5 @@ service ScmBlockLocationProtocolService { * Gets the scmInfo from SCM. */ rpc getScmInfo(hadoop.hdds.GetScmInfoRequestProto) - returns (hadoop.hdds.GetScmInfoRespsonseProto); + returns (hadoop.hdds.GetScmInfoResponseProto); } diff --git a/hadoop-hdds/common/src/main/proto/StorageContainerLocationProtocol.proto b/hadoop-hdds/common/src/main/proto/StorageContainerLocationProtocol.proto index 2c397efbbf..7ad19b112a 100644 --- a/hadoop-hdds/common/src/main/proto/StorageContainerLocationProtocol.proto +++ b/hadoop-hdds/common/src/main/proto/StorageContainerLocationProtocol.proto @@ -262,7 +262,7 @@ service StorageContainerLocationProtocolService { * Returns information about SCM. */ rpc getScmInfo(GetScmInfoRequestProto) - returns (GetScmInfoRespsonseProto); + returns (GetScmInfoResponseProto); /** * Checks if SCM is in SafeMode. diff --git a/hadoop-hdds/common/src/main/proto/hdds.proto b/hadoop-hdds/common/src/main/proto/hdds.proto index f5570503e5..ddde7ea93a 100644 --- a/hadoop-hdds/common/src/main/proto/hdds.proto +++ b/hadoop-hdds/common/src/main/proto/hdds.proto @@ -169,7 +169,7 @@ message GetScmInfoRequestProto { optional string traceID = 1; } -message GetScmInfoRespsonseProto { +message GetScmInfoResponseProto { required string clusterId = 1; required string scmId = 2; } @@ -222,8 +222,8 @@ message ContainerBlockID { */ message BlockTokenSecretProto { /** - * File access permissions mode. - */ + * File access permissions mode. + */ enum AccessModeProto { READ = 1; WRITE = 2;