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/09/17 22:48:16 UTC
svn commit: r1524221 - in
/hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec:
SecureCmdDoAs.java mr/ExecDriver.java mr/MapredLocalTask.java
Author: thejas
Date: Tue Sep 17 20:48:16 2013
New Revision: 1524221
URL: http://svn.apache.org/r1524221
Log:
HIVE-5246 - Local task for map join submitted via oozie job fails on a secure HDFS (Prasad Mujumdar via Brock Noland)
Modified:
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
Modified: hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java?rev=1524221&r1=1524220&r2=1524221&view=diff
==============================================================================
--- hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java (original)
+++ hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/SecureCmdDoAs.java Tue Sep 17 20:48:16 2013
@@ -38,14 +38,6 @@ public class SecureCmdDoAs {
tokenPath = ShimLoader.getHadoopShims().createDelegationTokenFile(conf);
}
- public String addArg(String cmdline) throws HiveException {
- StringBuilder sb = new StringBuilder();
- sb.append(cmdline);
- sb.append(" -hadooptoken ");
- sb.append(tokenPath.toUri().getPath());
- return sb.toString();
- }
-
public void addEnv(Map<String, String> env){
env.put(ShimLoader.getHadoopShims().getTokenFileLocEnvName(),
tokenPath.toUri().getPath());
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=1524221&r1=1524220&r2=1524221&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 Tue Sep 17 20:48:16 2013
@@ -615,7 +615,6 @@ public class ExecDriver extends Task<Map
boolean noLog = false;
String files = null;
boolean localtask = false;
- String hadoopAuthToken = null;
try {
for (int i = 0; i < args.length; i++) {
if (args[i].equals("-plan")) {
@@ -628,9 +627,6 @@ public class ExecDriver extends Task<Map
files = args[++i];
} else if (args[i].equals("-localtask")) {
localtask = true;
- } else if (args[i].equals("-hadooptoken")) {
- //set with HS2 in secure mode with doAs
- hadoopAuthToken = args[++i];
}
}
} catch (IndexOutOfBoundsException e) {
@@ -652,6 +648,9 @@ public class ExecDriver extends Task<Map
if (files != null) {
conf.set("tmpfiles", files);
}
+
+ String hadoopAuthToken =
+ System.getenv(ShimLoader.getHadoopShims().getTokenFileLocEnvName());
if(hadoopAuthToken != null){
conf.set("mapreduce.job.credentials.binary", hadoopAuthToken);
}
Modified: hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java?rev=1524221&r1=1524220&r2=1524221&view=diff
==============================================================================
--- hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java (original)
+++ hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java Tue Sep 17 20:48:16 2013
@@ -237,7 +237,6 @@ public class MapredLocalTask extends Tas
// then additional params need to be set so that the command is run as
// intended user
SecureCmdDoAs secureDoAs = new SecureCmdDoAs(conf);
- cmdLine = secureDoAs.addArg(cmdLine);
secureDoAs.addEnv(variables);
}