[prev in list] [next in list] [prev in thread] [next in thread]
List: hadoop-commits
Subject: svn commit: r1343290 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./
From: harsh () apache ! org
Date: 2012-05-28 15:36:01
Message-ID: 20120528153601.C434D238896F () eris ! apache ! org
[Download RAW message or body]
Author: harsh
Date: Mon May 28 15:36:00 2012
New Revision: 1343290
URL: http://svn.apache.org/viewvc?rev=1343290&view=rev
Log:
HADOOP-8358. Config-related WARN for dfs.web.ugi can be avoided. (harsh)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1343290&r1=1343289&r2=1343290&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 28 \
15:36:00 2012 @@ -189,6 +189,8 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8323. Add javadoc and tests for Text.clear() behavior (harsh)
+ HADOOP-8358. Config-related WARN for dfs.web.ugi can be avoided. (harsh)
+
BUG FIXES
HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-com \
mon/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=1343290&r1=1343289&r2=1343290&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java \
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java \
Mon May 28 15:36:00 2012 @@ -20,6 +20,7 @@ package org.apache.hadoop.fs;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.http.lib.StaticUserWebFilter;
/**
* This class contains constants for configuration keys used
@@ -163,5 +164,12 @@ public class CommonConfigurationKeys ext
"ha.failover-controller.cli-check.rpc-timeout.ms";
public static final int HA_FC_CLI_CHECK_TIMEOUT_DEFAULT = 20000;
+ /** Static user web-filter properties.
+ * See {@link StaticUserWebFilter}.
+ */
+ public static final String HADOOP_HTTP_STATIC_USER =
+ "hadoop.http.staticuser.user";
+ public static final String DEFAULT_HADOOP_HTTP_STATIC_USER =
+ "dr.who";
}
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-com \
mon/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java?rev=1343290&r1=1343289&r2=1343290&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java \
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/lib/StaticUserWebFilter.java \
Mon May 28 15:36:00 2012 @@ -37,15 +37,15 @@ import org.apache.hadoop.http.FilterInit
import javax.servlet.Filter;
+import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER;
+import static org.apache.hadoop.fs.CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER;
+
/**
* Provides a servlet filter that pretends to authenticate a fake user (Dr.Who)
* so that the web UI is usable for a secure cluster without authentication.
*/
public class StaticUserWebFilter extends FilterInitializer {
static final String DEPRECATED_UGI_KEY = "dfs.web.ugi";
-
- static final String USERNAME_KEY = "hadoop.http.staticuser.user";
- static final String USERNAME_DEFAULT = "dr.who";
private static final Log LOG = LogFactory.getLog(StaticUserWebFilter.class);
@@ -112,7 +112,7 @@ public class StaticUserWebFilter extends
@Override
public void init(FilterConfig conf) throws ServletException {
- this.username = conf.getInitParameter(USERNAME_KEY);
+ this.username = conf.getInitParameter(HADOOP_HTTP_STATIC_USER);
this.user = new User(username);
}
@@ -123,7 +123,7 @@ public class StaticUserWebFilter extends
HashMap<String, String> options = new HashMap<String, String>();
String username = getUsernameFromConf(conf);
- options.put(USERNAME_KEY, username);
+ options.put(HADOOP_HTTP_STATIC_USER, username);
container.addFilter("static_user_filter",
StaticUserFilter.class.getName(),
@@ -139,11 +139,12 @@ public class StaticUserWebFilter extends
// We can't use the normal configuration deprecation mechanism here
// since we need to split out the username from the configured UGI.
LOG.warn(DEPRECATED_UGI_KEY + " should not be used. Instead, use " +
- USERNAME_KEY + ".");
+ HADOOP_HTTP_STATIC_USER + ".");
String[] parts = oldStyleUgi.split(",");
return parts[0];
} else {
- return conf.get(USERNAME_KEY, USERNAME_DEFAULT);
+ return conf.get(HADOOP_HTTP_STATIC_USER,
+ DEFAULT_HADOOP_HTTP_STATIC_USER);
}
}
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-com \
mon/src/main/resources/core-default.xml?rev=1343290&r1=1343289&r2=1343290&view=diff \
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml \
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml \
Mon May 28 15:36:00 2012 @@ -1003,4 +1003,15 @@
this configuration will be loaded from within.
</description>
</property>
+
+<!-- Static Web User Filter properties. -->
+<property>
+ <description>
+ The user name to filter as, on static web filters
+ while rendering content. An example use is the HDFS
+ web UI (user to be used for browsing files).
+ </description>
+ <name>hadoop.http.staticuser.user</name>
+ <value>dr.who</value>
+</property>
</configuration>
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-com \
mon/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java?rev=1343290&r1=1343289&r2=1343290&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java \
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/lib/TestStaticUserWebFilter.java \
Mon May 28 15:36:00 2012 @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.http.lib.StaticUserWebFilter.StaticUserFilter;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
@@ -36,7 +37,7 @@ public class TestStaticUserWebFilter {
private FilterConfig mockConfig(String username) {
FilterConfig mock = Mockito.mock(FilterConfig.class);
Mockito.doReturn(username).when(mock).getInitParameter(
- StaticUserWebFilter.USERNAME_KEY);
+ CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER);
return mock;
}
@@ -73,7 +74,7 @@ public class TestStaticUserWebFilter {
@Test
public void testConfiguration() {
Configuration conf = new Configuration();
- conf.set(StaticUserWebFilter.USERNAME_KEY, "joe");
+ conf.set(CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER, "joe");
assertEquals("joe", StaticUserWebFilter.getUsernameFromConf(conf));
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic