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

Reverting my accidental revert of MAPREDUCE-5059 in the previous commit of YARN-500 from branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468743 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-04-17 04:22:34 +00:00
parent 3d2430fad1
commit 7f3fd5f03d
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/dao/JobInfo.java
View File

@ -287,7 +287,7 @@ private void countTasksAndAttempts(Job job) {
avgShuffleTime += (attempt.getShuffleFinishTime() - attempt avgShuffleTime += (attempt.getShuffleFinishTime() - attempt
.getLaunchTime()); .getLaunchTime());
avgMergeTime += attempt.getSortFinishTime() avgMergeTime += attempt.getSortFinishTime()
- attempt.getLaunchTime(); - attempt.getShuffleFinishTime();
avgReduceTime += (attempt.getFinishTime() - attempt avgReduceTime += (attempt.getFinishTime() - attempt
.getShuffleFinishTime()); .getShuffleFinishTime());
} }

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryEntities.java
View File

@ -94,11 +94,11 @@ public void testCompletedJob() throws Exception {
assertEquals(1, completedJob.getAMInfos().size()); assertEquals(1, completedJob.getAMInfos().size());
assertEquals(10, completedJob.getCompletedMaps()); assertEquals(10, completedJob.getCompletedMaps());
assertEquals(1, completedJob.getCompletedReduces()); assertEquals(1, completedJob.getCompletedReduces());
assertEquals(11, completedJob.getTasks().size()); assertEquals(12, completedJob.getTasks().size());
//Verify tasks loaded at this point. //Verify tasks loaded at this point.
assertEquals(true, completedJob.tasksLoaded.get()); assertEquals(true, completedJob.tasksLoaded.get());
assertEquals(10, completedJob.getTasks(TaskType.MAP).size()); assertEquals(10, completedJob.getTasks(TaskType.MAP).size());
assertEquals(1, completedJob.getTasks(TaskType.REDUCE).size()); assertEquals(2, completedJob.getTasks(TaskType.REDUCE).size());
assertEquals("user", completedJob.getUserName()); assertEquals("user", completedJob.getUserName());
assertEquals(JobState.SUCCEEDED, completedJob.getState()); assertEquals(JobState.SUCCEEDED, completedJob.getState());
JobReport jobReport = completedJob.getReport(); JobReport jobReport = completedJob.getReport();
@ -119,7 +119,7 @@ public void testCompletedTask() throws Exception {
Map<TaskId, Task> mapTasks = completedJob.getTasks(TaskType.MAP); Map<TaskId, Task> mapTasks = completedJob.getTasks(TaskType.MAP);
Map<TaskId, Task> reduceTasks = completedJob.getTasks(TaskType.REDUCE); Map<TaskId, Task> reduceTasks = completedJob.getTasks(TaskType.REDUCE);
assertEquals(10, mapTasks.size()); assertEquals(10, mapTasks.size());
assertEquals(1, reduceTasks.size()); assertEquals(2, reduceTasks.size());
Task mt1 = mapTasks.get(mt1Id); Task mt1 = mapTasks.get(mt1Id);
assertEquals(1, mt1.getAttempts().size()); assertEquals(1, mt1.getAttempts().size());
@ -196,12 +196,12 @@ public void testGetTaskAttemptCompletionEvent() throws Exception{
assertEquals("default",completedJob.getQueueName()); assertEquals("default",completedJob.getQueueName());
// progress // progress
assertEquals(1.0, completedJob.getProgress(),0.001); assertEquals(1.0, completedJob.getProgress(),0.001);
// 11 rows in answer // 12 rows in answer
assertEquals(11,completedJob.getTaskAttemptCompletionEvents(0,1000).length); assertEquals(12,completedJob.getTaskAttemptCompletionEvents(0,1000).length);
// select first 10 rows // select first 10 rows
assertEquals(10,completedJob.getTaskAttemptCompletionEvents(0,10).length); assertEquals(10,completedJob.getTaskAttemptCompletionEvents(0,10).length);
// select 5-10 rows include 5th // select 5-10 rows include 5th
assertEquals(6,completedJob.getTaskAttemptCompletionEvents(5,10).length); assertEquals(7,completedJob.getTaskAttemptCompletionEvents(5,10).length);
// without errors // without errors
assertEquals(1,completedJob.getDiagnostics().size()); assertEquals(1,completedJob.getDiagnostics().size());

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001-1329348443227-user-Sleep+job-1329348468601-10-1-SUCCEEDED-default.jhist
View File

File diff suppressed because one or more lines are too long