Procházet zdrojové kódy

MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1379597 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans před 12 roky
rodič
revize
d596baa622

+ 2 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -424,6 +424,8 @@ Release 0.23.3 - UNRELEASED
     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

+ 5 - 1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java

@@ -93,7 +93,11 @@ class YarnChild {
     // 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());

+ 3 - 6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java

@@ -428,12 +428,9 @@ class JobSubmitter {
   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 " +
-              org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier.stringifyToken(token));
-        }
+      LOG.info("Submitting tokens for job: " + jobId);
+      for (Token<?> token: credentials.getAllTokens()) {
+        LOG.info(token);
       }
     }
   }