This is an automated email from the ASF dual-hosted git repository.
licheng pushed a commit to branch HDDS-2823
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/HDDS-2823 by this push:
new 927c58a HDDS-4365: SCMBlockLocationFailoverProxyProvider should use
ScmBlockLocationProtocolPB.class in RPC.setProtocolEngine. (#1512)
927c58a is described below
commit 927c58a3d2fc842fe89e6ffe157931dba5ea44dd
Author: GlenGeng <[email protected]>
AuthorDate: Thu Oct 22 14:08:50 2020 +0800
HDDS-4365: SCMBlockLocationFailoverProxyProvider should use
ScmBlockLocationProtocolPB.class in RPC.setProtocolEngine. (#1512)
---
.../hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java | 5 ++---
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 3 ---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java
index 1beb69e..a9ff4c1 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java
@@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
-import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
import org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolPB;
import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource;
import org.apache.hadoop.io.retry.FailoverProxyProvider;
@@ -80,7 +79,7 @@ public class SCMBlockLocationFailoverProxyProvider implements
public SCMBlockLocationFailoverProxyProvider(ConfigurationSource conf) {
this.conf = conf;
- this.scmVersion = RPC.getProtocolVersion(ScmBlockLocationProtocol.class);
+ this.scmVersion = RPC.getProtocolVersion(ScmBlockLocationProtocolPB.class);
this.scmServiceId = conf.getTrimmed(OZONE_SCM_SERVICE_IDS_KEY);
this.scmProxies = new HashMap<>();
this.scmProxyInfoMap = new HashMap<>();
@@ -257,7 +256,7 @@ public class SCMBlockLocationFailoverProxyProvider
implements
InetSocketAddress scmAddress) throws IOException {
Configuration hadoopConf =
LegacyHadoopConfigurationSource.asHadoopConfiguration(conf);
- RPC.setProtocolEngine(hadoopConf, ScmBlockLocationProtocol.class,
+ RPC.setProtocolEngine(hadoopConf, ScmBlockLocationProtocolPB.class,
ProtobufRpcEngine.class);
return RPC.getProxy(ScmBlockLocationProtocolPB.class, scmVersion,
scmAddress, UserGroupInformation.getCurrentUser(), hadoopConf,
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 3129dee..85274cc 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -67,7 +67,6 @@ import
org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
import org.apache.hadoop.hdds.scm.protocol.StorageContainerLocationProtocol;
import
org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolClientSideTranslatorPB;
-import org.apache.hadoop.hdds.scm.protocolPB.ScmBlockLocationProtocolPB;
import
org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB;
import
org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolPB;
import org.apache.hadoop.hdds.scm.proxy.SCMBlockLocationFailoverProxyProvider;
@@ -805,8 +804,6 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
*/
private static ScmBlockLocationProtocol getScmBlockClient(
OzoneConfiguration conf) throws IOException {
- RPC.setProtocolEngine(conf, ScmBlockLocationProtocolPB.class,
- ProtobufRpcEngine.class);
ScmBlockLocationProtocolClientSideTranslatorPB scmBlockLocationClient =
new ScmBlockLocationProtocolClientSideTranslatorPB(
new SCMBlockLocationFailoverProxyProvider(conf));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
