hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject svn commit: r1481217 - in /hadoop/common/branches/branch-1: CHANGES.txt src/tools/org/apache/hadoop/tools/DistCp.java
Date Fri, 10 May 2013 22:01:57 GMT
Author: sseth
Date: Fri May 10 22:01:56 2013
New Revision: 1481217

URL: http://svn.apache.org/r1481217
Log:
MAPREDUCE-5217. Fix DistCP to work when launched by Oozie on a secure cluster. Contributed
by Venkat Ranganathan.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/DistCp.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1481217&r1=1481216&r2=1481217&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri May 10 22:01:56 2013
@@ -46,6 +46,9 @@ Release 1.3.0 - unreleased
     MAPREDUCE-5218. Annotate (comment) internal classes as Private. 
     (kkambatl via tucu)
 
+    MAPREDUCE-5217. Fix DistCP to work when launched by Oozie on a secure
+    cluster. (Venkat Ranganathan via sseth)
+
 Release 1.2.1 - Unreleased 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/DistCp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/DistCp.java?rev=1481217&r1=1481216&r2=1481217&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/DistCp.java (original)
+++ hadoop/common/branches/branch-1/src/tools/org/apache/hadoop/tools/DistCp.java Fri May
10 22:01:56 2013
@@ -979,6 +979,15 @@ public class DistCp implements Tool {
 
     jobconf.setMapperClass(CopyFilesMapper.class);
     jobconf.setNumReduceTasks(0);
+    // Propagate delegation related props to DistCp job
+    String tokenFile = System.getenv("HADOOP_TOKEN_FILE_LOCATION");
+    if (tokenFile != null) {
+      LOG
+        .info("Setting env property for mapreduce.job.credentials.binary to: "
+          + tokenFile);
+      jobconf.set("mapreduce.job.credentials.binary", tokenFile);
+    }
+
     return jobconf;
   }
 



Mime
View raw message