You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2013/10/10 03:27:55 UTC

svn commit: r1530839 - /hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java

Author: thejas
Date: Thu Oct 10 01:27:54 2013
New Revision: 1530839

URL: http://svn.apache.org/r1530839
Log:
HIVE-5497 : Hive trunk broken against hadoop 0.20.2 (Thejas M Nair via Brock Noland)

Modified:
    hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java

Modified: hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java?rev=1530839&r1=1530838&r2=1530839&view=diff
==============================================================================
--- hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java (original)
+++ hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java Thu Oct 10 01:27:54 2013
@@ -649,10 +649,12 @@ public class ExecDriver extends Task<Map
       conf.set("tmpfiles", files);
     }
 
-    String hadoopAuthToken =
-        System.getenv(ShimLoader.getHadoopShims().getTokenFileLocEnvName());
-    if(hadoopAuthToken != null){
-      conf.set("mapreduce.job.credentials.binary", hadoopAuthToken);
+    if(ShimLoader.getHadoopShims().isSecurityEnabled()){
+      String hadoopAuthToken =
+          System.getenv(ShimLoader.getHadoopShims().getTokenFileLocEnvName());
+      if(hadoopAuthToken != null){
+        conf.set("mapreduce.job.credentials.binary", hadoopAuthToken);
+      }
     }
 
     boolean isSilent = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVESESSIONSILENT);