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

svn merge -c 1510581 Merging from trunk to branch-2 to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510583 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2013-08-05 16:05:04 +00:00
parent 299b910a01
commit 7d36680e73
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,9 @@ Release 2.1.1-beta - UNRELEASED
MAPREDUCE-5352. Optimize node local splits generated by MAPREDUCE-5352. Optimize node local splits generated by
CombineFileInputFormat. (sseth) CombineFileInputFormat. (sseth)
MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race
conditions (jlowe via kihwal)
BUG FIXES BUG FIXES
MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
View File

@ -357,6 +357,10 @@ public class MRApp extends MRAppMaster {
} }
public void waitForState(Service.STATE finalState) throws Exception { public void waitForState(Service.STATE finalState) throws Exception {
if (finalState == Service.STATE.STOPPED) {
Assert.assertTrue("Timeout while waiting for MRApp to stop",
waitForServiceToStop(20 * 1000));
} else {
int timeoutSecs = 0; int timeoutSecs = 0;
while (!finalState.equals(getServiceState()) && timeoutSecs++ < 20) { while (!finalState.equals(getServiceState()) && timeoutSecs++ < 20) {
System.out.println("MRApp State is : " + getServiceState() System.out.println("MRApp State is : " + getServiceState()
@ -367,6 +371,7 @@ public class MRApp extends MRAppMaster {
Assert.assertEquals("MRApp state is not correct (timedout)", finalState, Assert.assertEquals("MRApp state is not correct (timedout)", finalState,
getServiceState()); getServiceState());
} }
}
public void verifyCompleted() { public void verifyCompleted() {
for (Job job : getContext().getAllJobs().values()) { for (Job job : getContext().getAllJobs().values()) {