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 st...@apache.org on 2023/02/09 13:30:03 UTC
[hadoop] branch branch-3.3 updated (752f6d82135 -> de08baded6b)
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
from 752f6d82135 HADOOP-18621. Resource leak in CryptoOutputStream.close() (#5347)
new b6680907f96 HDFS-16904. Close webhdfs during TestSymlinkHdfs teardown (#5342)
new de08baded6b HADOOP-18625. Fix method name of RPC.Builder#setnumReaders (#5301)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/hadoop/ipc/RPC.java | 16 +++++++++++++++-
.../src/test/java/org/apache/hadoop/ipc/TestRPC.java | 2 +-
.../hdfs/server/federation/router/RouterRpcServer.java | 2 +-
.../test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java | 2 ++
4 files changed, 19 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HDFS-16904. Close webhdfs during TestSymlinkHdfs teardown (#5342)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b6680907f96815950bfdd61974ac4cfc0e7d4e02
Author: Steve Vaughan <em...@stevevaughan.me>
AuthorDate: Wed Feb 8 12:15:42 2023 -0500
HDFS-16904. Close webhdfs during TestSymlinkHdfs teardown (#5342)
Contributed by Steve Vaughan Jr
---
.../hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java
index 042431e2a6c..6bab4af8ad5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.URI;
+import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.DFSConfigKeys;
@@ -99,6 +100,7 @@ abstract public class TestSymlinkHdfs extends SymlinkBaseTest {
if (cluster != null) {
cluster.shutdown();
}
+ IOUtils.closeQuietly(webhdfs);
}
@Test(timeout=10000)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HADOOP-18625. Fix method name of RPC.Builder#setnumReaders (#5301)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit de08baded6bf1552b20455b3b7ed37bb5adce39d
Author: huhaiyang <hu...@126.com>
AuthorDate: Thu Feb 9 21:28:34 2023 +0800
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 +++++++++++++++-
.../src/test/java/org/apache/hadoop/ipc/TestRPC.java | 2 +-
.../hdfs/server/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 fc562b525ad..c7ca09c60ba 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 class RPC {
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 362b8e3105e..7e1c6a12ccd 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
@@ -380,7 +380,7 @@ public class TestRPC extends TestRpcBase {
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 13189964d19..289848df309 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
@@ -298,7 +298,7 @@ public class RouterRpcServer extends AbstractService implements ClientProtocol,
.setBindAddress(confRpcAddress.getHostName())
.setPort(confRpcAddress.getPort())
.setNumHandlers(handlerCount)
- .setnumReaders(readerCount)
+ .setNumReaders(readerCount)
.setQueueSizePerHandler(handlerQueueSize)
.setVerbose(false)
.setSecretManager(this.securityManager.getSecretManager())
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org