From 63f941d2ad71bf528c5f565ec206a49571c59169 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Fri, 31 Aug 2012 20:37:41 +0000 Subject: [PATCH] MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379595 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 8 +++++--- .../main/java/org/apache/hadoop/mapred/YarnChild.java | 6 +++++- .../java/org/apache/hadoop/mapreduce/JobSubmitter.java | 10 +++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d403233ab01..e4593d0e9dc 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -323,9 +323,6 @@ Release 2.1.0-alpha - Unreleased MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby) - MAPREDUCE-4612. job summary file permissions not set when its created - (tgraves via bobby) - Release 2.0.0-alpha - 05-23-2012 INCOMPATIBLE CHANGES @@ -856,6 +853,11 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4600. TestTokenCache.java from MRV1 no longer compiles (daryn via bobby) + MAPREDUCE-4612. job summary file permissions not set when its created + (tgraves via bobby) + + MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java index c05c7aa69db..6413bb1a2f1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java @@ -93,7 +93,11 @@ public static void main(String[] args) throws Throwable { // Security framework already loaded the tokens into current ugi Credentials credentials = UserGroupInformation.getCurrentUser().getCredentials(); - + LOG.info("Executing with tokens:"); + for (Token token: credentials.getAllTokens()) { + LOG.info(token); + } + // Create TaskUmbilicalProtocol as actual task owner. UserGroupInformation taskOwner = UserGroupInformation.createRemoteUser(firstTaskid.getJobID().toString()); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java index 31081b332f3..23be73a752a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java @@ -435,13 +435,9 @@ private void writeConf(Configuration conf, Path jobFile) private void printTokens(JobID jobId, Credentials credentials) throws IOException { - if (LOG.isDebugEnabled()) { - LOG.debug("Printing tokens for job: " + jobId); - for(Token token: credentials.getAllTokens()) { - if (token.getKind().toString().equals("HDFS_DELEGATION_TOKEN")) { - LOG.debug("Submitting with " + token); - } - } + LOG.info("Submitting tokens for job: " + jobId); + for (Token token: credentials.getAllTokens()) { + LOG.info(token); } }