Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1585992 merging from trunk to branch-2 to fix:YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory intermittently fails. Contributed by Mit Desai. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585993 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2014-04-09 15:35:13 +00:00
parent 770aef5053
commit f10bf59e6e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -53,6 +53,9 @@ Release 2.5.0 - UNRELEASED
YARN-1784. TestContainerAllocation assumes CapacityScheduler. YARN-1784. TestContainerAllocation assumes CapacityScheduler.
(Robert Kanter via kasha) (Robert Kanter via kasha)
YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory
intermittently fails. (Mit Desai via kihwal)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
View File

@ -439,7 +439,7 @@ public class TestRMApplicationHistoryWriter {
int cleanedSize = cleaned.size(); int cleanedSize = cleaned.size();
waitCount = 0; waitCount = 0;
while (cleanedSize < allocatedSize && waitCount++ < 200) { while (cleanedSize < allocatedSize && waitCount++ < 200) {
Thread.sleep(100); Thread.sleep(300);
resp = nm.nodeHeartbeat(true); resp = nm.nodeHeartbeat(true);
cleaned = resp.getContainersToCleanup(); cleaned = resp.getContainersToCleanup();
cleanedSize += cleaned.size(); cleanedSize += cleaned.size();