You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by co...@apache.org on 2010/11/11 20:52:24 UTC
svn commit: r1034082 - in /hadoop/hdfs/trunk: CHANGES.txt
src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java
src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java
Author: cos
Date: Thu Nov 11 19:52:24 2010
New Revision: 1034082
URL: http://svn.apache.org/viewvc?rev=1034082&view=rev
Log:
HDFS-1164. TestHdfsProxy is failing. Contributed by Todd Lipcon.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java
hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1034082&r1=1034081&r2=1034082&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu Nov 11 19:52:24 2010
@@ -42,6 +42,8 @@ Trunk (unreleased changes)
HDFS-1457. Provide an option to throttle image transmission between
pimary and secondary NameNodes. (Yifei Lu and hairong via hairong)
+ HDFS-1164. TestHdfsProxy is failing. (Todd Lipcon via cos)
+
IMPROVEMENTS
HDFS-1304. Add a new unit test for HftpFileSystem.open(..). (szetszwo)
Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java?rev=1034082&r1=1034081&r2=1034082&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java Thu Nov 11 19:52:24 2010
@@ -315,7 +315,7 @@ public class ProxyFilter implements Filt
String ugi = rqst.getParameter("ugi");
if (ugi != null) {
rqst.setAttribute("authorized.ugi", UserGroupInformation.createRemoteUser(ugi));
- rqst.setAttribute("org.apache.hadoop.hdfsproxy.authorized.userID", ugi);
+ rqst.setAttribute("org.apache.hadoop.hdfsproxy.authorized.userID", ugi.split(",")[0]);
}
}
chain.doFilter(request, response);
Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java?rev=1034082&r1=1034081&r2=1034082&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java Thu Nov 11 19:52:24 2010
@@ -41,6 +41,7 @@ import org.apache.hadoop.hdfs.server.dat
import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.UserGroupInformation;
/**
* A JUnit test for HdfsProxy
@@ -203,13 +204,17 @@ public class TestHdfsProxy extends TestC
MiniDFSCluster cluster = null;
HdfsProxy proxy = null;
try {
+ final UserGroupInformation CLIENT_UGI = UserGroupInformation.getCurrentUser();
+ final String testUser = CLIENT_UGI.getShortUserName();
+ final String testGroup = CLIENT_UGI.getGroupNames()[0];
final Configuration dfsConf = new HdfsConfiguration();
- dfsConf.set("hadoop.proxyuser." + System.getProperty("user.name") +
- ".users", "users");
- dfsConf.set("hadoop.proxyuser.users.ip-addresses", "localhost");
- dfsConf.set("hadoop.proxyuser." + System.getProperty("user.name") +
- ".ip-addresses", "localhost");
+ dfsConf.set("hadoop.proxyuser." + testUser +
+ ".groups", testGroup);
+ dfsConf.set("hadoop.proxyuser." + testGroup + ".hosts",
+ "localhost,127.0.0.1");
+ dfsConf.set("hadoop.proxyuser." + testUser +
+ ".hosts", "localhost,127.0.0.1");
cluster = new MiniDFSCluster.Builder(dfsConf).numDataNodes(2).build();
cluster.waitActive();