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 ro...@apache.org on 2016/01/29 08:00:28 UTC
hadoop git commit: YARN-4543. Fix random test failure in
TestNodeStatusUpdater.testStopReentrant. (Akihiro Suda via rohithsharmaks)
Repository: hadoop
Updated Branches:
refs/heads/trunk 09d831c95 -> ac6866680
YARN-4543. Fix random test failure in TestNodeStatusUpdater.testStopReentrant. (Akihiro Suda via rohithsharmaks)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ac686668
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac686668
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac686668
Branch: refs/heads/trunk
Commit: ac686668031ee9837deed3f3566f09f33c437870
Parents: 09d831c
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Fri Jan 29 12:29:54 2016 +0530
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Fri Jan 29 12:29:54 2016 +0530
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/server/nodemanager/TestNodeStatusUpdater.java | 9 ++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac686668/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ee57e4b..dd61f2a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -173,6 +173,9 @@ Release 2.9.0 - UNRELEASED
YARN-4519. Potential deadlock of CapacityScheduler between decrease container
and assign containers. (Meng Ding via jianhe)
+ YARN-4543. Fix random test failure in TestNodeStatusUpdater.testStopReentrant
+ (Akihiro Suda via rohithsharmaks)
+
Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac686668/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
----------------------------------------------------------------------
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 a8066c1..9e6868d 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
@@ -1269,7 +1269,14 @@ public class TestNodeStatusUpdater {
}
Assert.assertEquals(STATE.STOPPED, nm.getServiceState());
- Assert.assertEquals(numCleanups.get(), 1);
+
+ // It further takes a while after NM reached the STOPPED state.
+ waitCount = 0;
+ while (numCleanups.get() == 0 && waitCount++ != 20) {
+ LOG.info("Waiting for NM shutdown..");
+ Thread.sleep(1000);
+ }
+ Assert.assertEquals(1, numCleanups.get());
}
@Test