You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2020/11/06 23:35:31 UTC
[hadoop] branch branch-2.10 updated: HDFS-15623. Respect configured
values of rpc.engine (#2403) Contributed by Hector Chaverri.
This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 9160b0e HDFS-15623. Respect configured values of rpc.engine (#2403) Contributed by Hector Chaverri.
9160b0e is described below
commit 9160b0e8c8e2b0e4cfd61c397814b71449d11448
Author: hchaverr <hc...@linkedin.com>
AuthorDate: Thu Oct 22 10:32:28 2020 -0700
HDFS-15623. Respect configured values of rpc.engine (#2403) Contributed by Hector Chaverri.
(cherry picked from commit 6eacaffeea21e7e9286497ee17f89fd939d2eead)
---
.../src/main/java/org/apache/hadoop/ipc/RPC.java | 8 ++++++--
.../src/test/java/org/apache/hadoop/ipc/TestRPC.java | 12 ++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
index 07dcbdd..6186740 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
@@ -191,14 +191,18 @@ public class RPC {
private static final String ENGINE_PROP = "rpc.engine";
/**
- * Set a protocol to use a non-default RpcEngine.
+ * Set a protocol to use a non-default RpcEngine if one
+ * is not specified in the configuration.
* @param conf configuration to use
* @param protocol the protocol interface
* @param engine the RpcEngine impl
*/
public static void setProtocolEngine(Configuration conf,
Class<?> protocol, Class<?> engine) {
- conf.setClass(ENGINE_PROP+"."+protocol.getName(), engine, RpcEngine.class);
+ if (conf.get(ENGINE_PROP+"."+protocol.getName()) == null) {
+ conf.setClass(ENGINE_PROP+"."+protocol.getName(), engine,
+ RpcEngine.class);
+ }
}
// return the RpcEngine configured to handle a protocol
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
index 2034a2e..ac99900 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
@@ -1518,6 +1518,18 @@ public class TestRPC extends TestRpcBase {
}
}
+ @Test
+ public void testSetProtocolEngine() {
+ Configuration conf = new Configuration();
+ RPC.setProtocolEngine(conf, StoppedProtocol.class, StoppedRpcEngine.class);
+ RpcEngine rpcEngine = RPC.getProtocolEngine(StoppedProtocol.class, conf);
+ assertTrue(rpcEngine instanceof StoppedRpcEngine);
+
+ RPC.setProtocolEngine(conf, StoppedProtocol.class, ProtobufRpcEngine.class);
+ rpcEngine = RPC.getProtocolEngine(StoppedProtocol.class, conf);
+ assertTrue(rpcEngine instanceof StoppedRpcEngine);
+ }
+
public static void main(String[] args) throws Exception {
new TestRPC().testCallsInternal(conf);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org