From 113a9e40cbf2b8303910547d8d4476af60846996 Mon Sep 17 00:00:00 2001 From: huhaiyang Date: Thu, 9 Feb 2023 21:28:34 +0800 Subject: [PATCH] HADOOP-18625. Fix method name of RPC.Builder#setnumReaders (#5301) Changes method name of RPC.Builder#setnumReaders to setNumReaders() The original method is still there, just marked deprecated. It is the one which should be used when working with older branches. Contributed by Haiyang Hu --- .../src/main/java/org/apache/hadoop/ipc/RPC.java | 16 +++++++++++++++- .../test/java/org/apache/hadoop/ipc/TestRPC.java | 2 +- .../federation/router/RouterRpcServer.java | 2 +- 3 files changed, 17 insertions(+), 3 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 fc562b525a..c7ca09c60b 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 @@ -896,15 +896,29 @@ public Builder setNumHandlers(int numHandlers) { this.numHandlers = numHandlers; return this; } - + /** * @return Default: -1. * @param numReaders input numReaders. + * @deprecated call {@link #setNumReaders(int value)} instead. */ + @Deprecated public Builder setnumReaders(int numReaders) { this.numReaders = numReaders; return this; } + + /** + * Set the number of reader threads. + * + * @return this builder. + * @param value input numReaders. + * @since HADOOP-18625. + */ + public Builder setNumReaders(int value) { + this.numReaders = value; + return this; + } /** * @return Default: -1. 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 084a3dbd4a..a7727716c4 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 @@ -378,7 +378,7 @@ public void testConfRpc() throws IOException { assertEquals(confReaders, server.getNumReaders()); server = newServerBuilder(conf) - .setNumHandlers(1).setnumReaders(3).setQueueSizePerHandler(200) + .setNumHandlers(1).setNumReaders(3).setQueueSizePerHandler(200) .setVerbose(false).build(); assertEquals(3, server.getNumReaders()); diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java index 45676cea63..9d4c2caaa1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java @@ -333,7 +333,7 @@ public RouterRpcServer(Configuration conf, Router router, .setBindAddress(confRpcAddress.getHostName()) .setPort(confRpcAddress.getPort()) .setNumHandlers(handlerCount) - .setnumReaders(readerCount) + .setNumReaders(readerCount) .setQueueSizePerHandler(handlerQueueSize) .setVerbose(false) .setAlignmentContext(routerStateIdContext)