MAPREDUCE-3645. TestJobHistory fails. (Thomas Graves via mahadev) - Merging r1230307 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230308 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mahadev Konar 2012-01-11 22:54:44 +00:00
parent 4c4a0f4f6c
commit 15c7957088
2 changed files with 7 additions and 3 deletions

View File

@ -410,6 +410,8 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3651. TestQueueManagerRefresh fails. (Thomas Graves via mahadev) MAPREDUCE-3651. TestQueueManagerRefresh fails. (Thomas Graves via mahadev)
MAPREDUCE-3645. TestJobHistory fails. (Thomas Graves via mahadev)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -57,6 +57,7 @@ import org.apache.hadoop.mapreduce.jobhistory.JobSubmittedEvent;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.JobInfo; import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.JobInfo;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskAttemptInfo; import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskAttemptInfo;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskInfo; import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskInfo;
import org.apache.hadoop.net.Node;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AccessControlList; import org.apache.hadoop.security.authorize.AccessControlList;
@ -520,12 +521,13 @@ public class TestJobHistory extends TestCase {
attempt.getHttpPort()); attempt.getHttpPort());
if (attempt.getTaskStatus().equals("SUCCEEDED")) { if (attempt.getTaskStatus().equals("SUCCEEDED")) {
String ttHostname = jt.getNode(ttStatus.getHost()).toString(); Node node = jt.getNode(ttStatus.getHost());
String ttHostname = node.getName();
// check if hostname is valid // check if hostname is valid
assertTrue("Host name of task attempt " + attemptId + assertTrue("Host name : " + attempt.getHostname() + " of task attempt " + attemptId +
" obtained from" + " obtained from" +
" history file did not match the expected value", " history file did not match the expected value " + ttHostname,
ttHostname.equals(attempt.getHostname())); ttHostname.equals(attempt.getHostname()));
} }
} }