Author: tucu
Date: Fri Feb 10 23:20:20 2012
New Revision: 1242973

URL: http://svn.apache.org/viewvc?rev=1242973&view=rev
Log:
OOZIE-689 XTestCase proxyuser settings fails with Hadoop 1.0.0/0.23.1 (tucu)

Modified:
    
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/test/XTestCase.java
    incubator/oozie/branches/branch-3.1/release-log.txt

Modified: 
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1242973&r1=1242972&r2=1242973&view=diff
==============================================================================
--- 
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/test/XTestCase.java
 (original)
+++ 
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/test/XTestCase.java
 Fri Feb 10 23:20:20 2012
@@ -22,6 +22,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -651,7 +652,17 @@ public abstract class XTestCase extends 
             conf.set("dfs.block.access.token.enable", "false");
             conf.set("dfs.permissions", "true");
             conf.set("hadoop.security.authentication", "simple");
-            conf.set("hadoop.proxyuser." + oozieUser + ".hosts", "localhost");
+
+            //Doing this because Hadoop 1.x does not support '*' and
+            //Hadoop 0.23.x does not process wildcard if the value is
+            // '*,127.0.0.1'
+            StringBuilder sb = new StringBuilder();
+            sb.append("127.0.0.1,localhost");
+            for (InetAddress i : 
InetAddress.getAllByName(InetAddress.getLocalHost().getHostName())) {
+                sb.append(",").append(i.getCanonicalHostName());
+            }
+            conf.set("hadoop.proxyuser." + oozieUser + ".hosts", 
sb.toString());
+
             conf.set("hadoop.proxyuser." + oozieUser + ".groups", 
getTestGroup());
             conf.set("mapred.tasktracker.map.tasks.maximum", "4");
             conf.set("mapred.tasktracker.reduce.tasks.maximum", "4");

Modified: incubator/oozie/branches/branch-3.1/release-log.txt
URL: 
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/release-log.txt?rev=1242973&r1=1242972&r2=1242973&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.1/release-log.txt Fri Feb 10 23:20:20 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.1.3 release
 
+OOZIE-689 XTestCase proxyuser settings fails with Hadoop 1.0.0/0.23.1 (tucu)
 OOZIE-601 Oozie's POMs should use org.apache.oozie as group (tucu)
 OOZIE-685 Update License file with 3rd party license information. (Mohammad)
 OOZIE-682 Update version 3.1.3 to 3.1.3-incubating in all pom.xml.(Mohammad)


Reply via email to