Author: tucu
Date: Fri Mar 15 18:50:51 2013
New Revision: 1457061
URL: http://svn.apache.org/r1457061
Log:
MAPREDUCE-4571. TestHsWebServicesJobs fails on jdk7. (tgraves via tucu)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1457061&r1=1457060&r2=1457061&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Mar 15
18:50:51 2013
@@ -230,6 +230,8 @@ Release 2.0.5-beta - UNRELEASED
appropriately used and that on-disk segments are correctly sorted on
file-size. (Anty Rao and Ravi Prakash via acmurthy)
+ MAPREDUCE-4571. TestHsWebServicesJobs fails on jdk7. (tgraves via tucu)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java?rev=1457061&r1=1457060&r2=1457061&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryJobs.java
Fri Mar 15 18:50:51 2013
@@ -77,13 +77,18 @@ public class MockHistoryJobs extends Moc
for(Map.Entry<JobId, Job> entry: mocked.entrySet()) {
JobId id = entry.getKey();
Job j = entry.getValue();
- ret.full.put(id, new MockCompletedJob(j));
- JobReport report = j.getReport();
+ MockCompletedJob mockJob = new MockCompletedJob(j);
+ // use MockCompletedJob to set everything below to make sure
+ // consistent with what history server would do
+ ret.full.put(id, mockJob);
+ JobReport report = mockJob.getReport();
JobIndexInfo info = new JobIndexInfo(report.getStartTime(),
- report.getFinishTime(), j.getUserName(), j.getName(), id,
- j.getCompletedMaps(), j.getCompletedReduces(),
String.valueOf(j.getState()));
- info.setQueueName(j.getQueueName());
+ report.getFinishTime(), mockJob.getUserName(), mockJob.getName(),
id,
+ mockJob.getCompletedMaps(), mockJob.getCompletedReduces(),
+ String.valueOf(mockJob.getState()));
+ info.setQueueName(mockJob.getQueueName());
ret.partial.put(id, new PartialJob(info, id));
+
}
return ret;
}
@@ -99,12 +104,16 @@ public class MockHistoryJobs extends Moc
@Override
public int getCompletedMaps() {
- return job.getCompletedMaps();
+ // we always return total since this is history server
+ // and PartialJob also assumes completed - total
+ return job.getTotalMaps();
}
@Override
public int getCompletedReduces() {
- return job.getCompletedReduces();
+ // we always return total since this is history server
+ // and PartialJob also assumes completed - total
+ return job.getTotalReduces();
}
@Override
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java?rev=1457061&r1=1457060&r2=1457061&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java
Fri Mar 15 18:50:51 2013
@@ -117,6 +117,7 @@ public class TestHsWebServicesJobs exten
fullJobs = jobs.full;
}
+
TestAppContext(int appid, int numJobs, int numTasks, int numAttempts) {
this(appid, numJobs, numTasks, numAttempts, false);
}
@@ -411,7 +412,8 @@ public class TestHsWebServicesJobs exten
JSONObject json = response.getEntity(JSONObject.class);
assertEquals("incorrect number of elements", 1, json.length());
JSONObject info = json.getJSONObject("job");
- VerifyJobsUtils.verifyHsJob(info, jobsMap.get(id));
+
+ VerifyJobsUtils.verifyHsJob(info, appContext.getJob(id));
}
}
@@ -613,7 +615,7 @@ public class TestHsWebServicesJobs exten
JSONObject json = response.getEntity(JSONObject.class);
assertEquals("incorrect number of elements", 1, json.length());
JSONObject info = json.getJSONObject("jobCounters");
- verifyHsJobCounters(info, jobsMap.get(id));
+ verifyHsJobCounters(info, appContext.getJob(id));
}
}
@@ -631,7 +633,7 @@ public class TestHsWebServicesJobs exten
JSONObject json = response.getEntity(JSONObject.class);
assertEquals("incorrect number of elements", 1, json.length());
JSONObject info = json.getJSONObject("jobCounters");
- verifyHsJobCounters(info, jobsMap.get(id));
+ verifyHsJobCounters(info, appContext.getJob(id));
}
}
@@ -689,7 +691,7 @@ public class TestHsWebServicesJobs exten
JSONObject json = response.getEntity(JSONObject.class);
assertEquals("incorrect number of elements", 1, json.length());
JSONObject info = json.getJSONObject("jobCounters");
- verifyHsJobCounters(info, jobsMap.get(id));
+ verifyHsJobCounters(info, appContext.getJob(id));
}
}
@@ -711,7 +713,7 @@ public class TestHsWebServicesJobs exten
is.setCharacterStream(new StringReader(xml));
Document dom = db.parse(is);
NodeList info = dom.getElementsByTagName("jobCounters");
- verifyHsJobCountersXML(info, jobsMap.get(id));
+ verifyHsJobCountersXML(info, appContext.getJob(id));
}
}
