You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by bi...@apache.org on 2013/06/06 23:02:06 UTC
svn commit: r1490444 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java
Author: bikas
Date: Thu Jun 6 21:02:05 2013
New Revision: 1490444
URL: http://svn.apache.org/r1490444
Log:
Merge r1490440 from branch-2 to branch-2.1-beta for YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt?rev=1490444&r1=1490443&r2=1490444&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt Thu Jun 6 21:02:05 2013
@@ -254,6 +254,9 @@ Release 2.1.0-beta - UNRELEASED
YARN-756. Move Preemption* records to yarn.api where they really belong.
(Jian He via vinodkv)
+ YARN-750. Allow for black-listing resources in YARN API and Impl in CS
+ (acmurthy via bikas)
+
OPTIMIZATIONS
YARN-512. Log aggregation root directory check is more expensive than it
@@ -425,6 +428,8 @@ Release 2.1.0-beta - UNRELEASED
YARN-764. blank Used Resources on Capacity Scheduler page (Nemon Lou via
tgraves)
+ YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
YARN-158. Yarn creating package-info.java must not depend on sh.
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java?rev=1490444&r1=1490443&r2=1490444&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java Thu Jun 6 21:02:05 2013
@@ -121,8 +121,11 @@ public class TestNMClientAsync {
}
Assert.assertEquals("Error occurs in ContainerEventProcessor", 0,
((MockNMClientAsync1) asyncClient).errorMsgs.size());
- Assert.assertEquals("Completed container is not removed", 0,
- asyncClient.containers.size());
+ // When the callback functions are all executed, the event processor threads
+ // may still not terminate and the containers may still not removed.
+ while (asyncClient.containers.size() > 0) {
+ Thread.sleep(10);
+ }
asyncClient.stop();
Assert.assertFalse(
"The thread of Container Management Event Dispatcher is still alive",