Author: daijy
Date: Mon Mar 22 19:40:36 2010
New Revision: 926270
URL: http://svn.apache.org/viewvc?rev=926270&view=rev
Log:
PIG-1312: Make Pig work with hadoop security
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=926270&r1=926269&r2=926270&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Mon Mar 22 19:40:36 2010
@@ -68,6 +68,8 @@ manner (rding via pradeepkth)
IMPROVEMENTS
+PIG-1312: Make Pig work with hadoop security (daijy)
+
PIG-1308: Inifinite loop in JobClient when reading from BinStorage Message:
[org.apache.hadoop.mapreduce.lib.input.FileInputFormat - Total input paths to
process : 2] (pradeepkth)
Modified:
hadoop/pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java?rev=926270&r1=926269&r2=926270&view=diff
==============================================================================
---
hadoop/pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
(original)
+++
hadoop/pig/trunk/src/org/apache/pig/impl/builtin/DefaultIndexableLoader.java
Mon Mar 22 19:40:36 2010
@@ -194,13 +194,18 @@ public class DefaultIndexableLoader exte
private void initRightLoader(int [] splitsToBeRead) throws IOException{
PigContext pc = (PigContext) ObjectSerializer
.deserialize(PigMapReduce.sJobConf.get("pig.pigContext"));
+
+ Configuration conf =
ConfigurationUtil.toConfiguration(pc.getProperties());
+
+ // Hadoop security need this property to be set
+ if (System.getenv("HADOOP_TOKEN_FILE_LOCATION") != null) {
+ conf.set("mapreduce.job.credentials.binary",
+ System.getenv("HADOOP_TOKEN_FILE_LOCATION"));
+ }
+
//create ReadToEndLoader that will read the given splits in order
- loader = new ReadToEndLoader(
-
(LoadFunc)PigContext.instantiateFuncFromSpec(rightLoaderFuncSpec),
- ConfigurationUtil.toConfiguration(pc.getProperties()),
- inpLocation,
- splitsToBeRead
- );
+ loader = new
ReadToEndLoader((LoadFunc)PigContext.instantiateFuncFromSpec(rightLoaderFuncSpec),
+ conf, inpLocation, splitsToBeRead);
}
private Object extractKeysFromIdxTuple(Tuple idxTuple) throws
ExecException{
