Repository: hadoop Updated Branches: refs/heads/branch-2 6db7bfbcf -> 801ce47e2
MAPREDUCE-6508. TestNetworkedJob fails consistently due to delegation token changes on RM. Contributed by Akira AJISAKA (cherry picked from commit eb6379ca25e1bb6d3978bd3a021723c38c95bec9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/801ce47e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/801ce47e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/801ce47e Branch: refs/heads/branch-2 Commit: 801ce47e28faeebbf8ff64348c82a4b6a94028bb Parents: 6db7bfb Author: Junping Du <junping...@apache.org> Authored: Fri Oct 23 10:05:46 2015 -0700 Committer: Junping Du <junping...@apache.org> Committed: Fri Oct 23 10:07:41 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapred/TestNetworkedJob.java | 16 ---------------- 2 files changed, 3 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/801ce47e/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 564a92a..045ca4e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -336,6 +336,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6495. Docs for archive-logs tool (rkanter) + MAPREDUCE-6508. TestNetworkedJob fails consistently due to delegation + token changes on RM. (Akira AJISAKA via junping_du) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/801ce47e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java index cfe4705..2e0887e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java @@ -36,8 +36,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapreduce.security.token.delegation.DelegationTokenIdentifier; -import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.ClusterStatus.BlackListInfo; import org.apache.hadoop.mapred.JobClient.NetworkedJob; import org.apache.hadoop.mapred.JobClient.TaskStatusFilter; @@ -49,8 +47,6 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.junit.Test; -import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.security.token.Token; public class TestNetworkedJob { private static String TEST_ROOT_DIR = new File(System.getProperty( @@ -221,11 +217,6 @@ public class TestNetworkedJob { status2.getBlackListedTrackersInfo()); assertEquals(status.getMapTasks(), status2.getMapTasks()); - try { - } catch (RuntimeException e) { - assertTrue(e.getMessage().endsWith("not found on CLASSPATH")); - } - // test taskStatusfilter JobClient.setTaskOutputFilter(job, TaskStatusFilter.ALL); assertEquals(JobClient.getTaskOutputFilter(job), TaskStatusFilter.ALL); @@ -256,15 +247,8 @@ public class TestNetworkedJob { assertEquals(aai.length, 2); assertEquals(aai[0].getQueueName(), "root"); assertEquals(aai[1].getQueueName(), "default"); - // test token - Token<DelegationTokenIdentifier> token = client - .getDelegationToken(new Text(UserGroupInformation.getCurrentUser() - .getShortUserName())); - assertEquals(token.getKind().toString(), "RM_DELEGATION_TOKEN"); // test JobClient - - // The following asserts read JobStatus twice and ensure the returned // JobStatus objects correspond to the same Job. assertEquals("Expected matching JobIDs", jobId, client.getJob(jobId)
