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 eb...@apache.org on 2021/04/19 20:07:36 UTC
[hadoop] branch branch-3.2 updated: YARN-10460. Upgrading to JUnit
4.13 causes tests in TestNodeStatusUpdater to fail. Contributed by Peter
Bacsko.
This is an automated email from the ASF dual-hosted git repository.
ebadger pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new bf0d058 YARN-10460. Upgrading to JUnit 4.13 causes tests in TestNodeStatusUpdater to fail. Contributed by Peter Bacsko.
bf0d058 is described below
commit bf0d058b698b15d1c51927b8fd8cf678ab95661a
Author: Eric Badger <eb...@verizonmedia.com>
AuthorDate: Mon Apr 19 20:06:36 2021 +0000
YARN-10460. Upgrading to JUnit 4.13 causes tests in TestNodeStatusUpdater to fail. Contributed by Peter Bacsko.
---
.../src/main/java/org/apache/hadoop/ipc/ClientCache.java | 8 ++++++++
.../src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java | 5 ++++-
.../hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java | 7 +++++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
index ee5f8bb..8a5e324 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientCache.java
@@ -29,6 +29,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.ObjectWritable;
import org.apache.hadoop.io.Writable;
+import com.google.common.annotations.VisibleForTesting;
+
/* Cache a client using its socket factory as the hash key */
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving
@@ -114,4 +116,10 @@ public class ClientCache {
client.stop();
}
}
+
+ @VisibleForTesting
+ public void clearCache() {
+ clients.values().forEach(c -> c.stop());
+ clients.clear();
+ }
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
index 15d068b..5db2cc1 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
@@ -335,7 +335,10 @@ public class ProtobufRpcEngine implements RpcEngine {
RpcWritable.Buffer.class);
}
-
+ @VisibleForTesting
+ public static void clearClientCache() {
+ CLIENTS.clearCache();
+ }
@Override
public RPC.Server getServer(Class<?> protocol, Object protocolImpl,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
index 43a8d3b..e916e73 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
@@ -52,6 +52,7 @@ import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.io.retry.RetryProxy;
+import org.apache.hadoop.ipc.ProtobufRpcEngine;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.net.ServerSocketUtil;
@@ -122,6 +123,12 @@ public class TestNodeStatusUpdater extends NodeManagerTestBase {
private NodeManager nm;
private AtomicBoolean assertionFailedInThread = new AtomicBoolean(false);
+ @Before
+ public void before() {
+ // to avoid threading issues with JUnit 4.13+
+ ProtobufRpcEngine.clearClientCache();
+ }
+
@After
public void tearDown() {
this.registeredNodes.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org