Author: kihwal
Date: Mon Aug 5 16:05:04 2013
New Revision: 1510583
URL: http://svn.apache.org/r1510583
Log:
svn merge -c 1510581 Merging from trunk to branch-2 to fix MAPREDUCE-5446.
TestJobHistoryEvents and TestJobHistoryParsing have race conditions.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1510583&r1=1510582&r2=1510583&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon
Aug 5 16:05:04 2013
@@ -49,6 +49,9 @@ Release 2.1.1-beta - UNRELEASED
MAPREDUCE-5352. Optimize node local splits generated by
CombineFileInputFormat. (sseth)
+ MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race
+ conditions (jlowe via kihwal)
+
BUG FIXES
MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java?rev=1510583&r1=1510582&r2=1510583&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java
Mon Aug 5 16:05:04 2013
@@ -357,15 +357,20 @@ public class MRApp extends MRAppMaster {
}
public void waitForState(Service.STATE finalState) throws Exception {
- int timeoutSecs = 0;
- while (!finalState.equals(getServiceState()) && timeoutSecs++ < 20) {
- System.out.println("MRApp State is : " + getServiceState()
- + " Waiting for state : " + finalState);
- Thread.sleep(500);
- }
- System.out.println("MRApp State is : " + getServiceState());
- Assert.assertEquals("MRApp state is not correct (timedout)", finalState,
- getServiceState());
+ if (finalState == Service.STATE.STOPPED) {
+ Assert.assertTrue("Timeout while waiting for MRApp to stop",
+ waitForServiceToStop(20 * 1000));
+ } else {
+ int timeoutSecs = 0;
+ while (!finalState.equals(getServiceState()) && timeoutSecs++ < 20) {
+ System.out.println("MRApp State is : " + getServiceState()
+ + " Waiting for state : " + finalState);
+ Thread.sleep(500);
+ }
+ System.out.println("MRApp State is : " + getServiceState());
+ Assert.assertEquals("MRApp state is not correct (timedout)", finalState,
+ getServiceState());
+ }
}
public void verifyCompleted() {
