Author: todd
Date: Fri May 20 03:44:23 2011
New Revision: 1125222
URL: http://svn.apache.org/viewvc?rev=1125222&view=rev
Log:
MAPREDUCE-2516. Rename webinterface.private.actions to
mapreduce.jobtracker.webinterface.trusted. Contributed by Ari Rabkin.
Modified:
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
hadoop/mapreduce/branches/branch-0.22/src/java/mapred-default.xml
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1125222&r1=1125221&r2=1125222&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Fri May 20 03:44:23 2011
@@ -217,6 +217,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2372. TaskLogAppender mechanism shouldn't be set up in
log4j.properties (todd)
+ MAPREDUCE-2516. Rename webinterface.private.actions to
+ mapreduce.jobtracker.webinterface.trusted (Ari Rabkin via todd)
+
OPTIMIZATIONS
MAPREDUCE-1354. Enhancements to JobTracker for better performance and
Modified: hadoop/mapreduce/branches/branch-0.22/src/java/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/mapred-default.xml?rev=1125222&r1=1125221&r2=1125222&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/java/mapred-default.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/java/mapred-default.xml Fri May
20 03:44:23 2011
@@ -1004,6 +1004,16 @@
</property>
<property>
+ <name>mapreduce.jobtracker.webinterface.trusted</name>
+ <value>false</value>
+ <description> If set to true, the web interface of the JobTracker
+ will include actions such as kill job that are security
sensitive.
+ Leave this option as false if untrusted users have access to
the web interface.
+ </description>
+</property>
+
+
+<property>
<name>mapreduce.tasktracker.indexcache.mb</name>
<value>10</value>
<description> The maximum memory that a task tracker allows for the
Modified:
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java?rev=1125222&r1=1125221&r2=1125222&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java
Fri May 20 03:44:23 2011
@@ -49,7 +49,6 @@ import org.apache.hadoop.util.ServletUti
import org.apache.hadoop.util.StringUtils;
class JSPUtil {
- static final String PRIVATE_ACTIONS_KEY = "webinterface.private.actions";
//LRU based cache
private static final Map<String, JobInfo> jobHistoryCache =
@@ -476,7 +475,7 @@ class JSPUtil {
}
static boolean privateActionsAllowed(JobConf conf) {
- return conf.getBoolean(PRIVATE_ACTIONS_KEY, false);
+ return conf.getBoolean(JTConfig.PRIVATE_ACTIONS_KEY, false);
}
static Path getJobConfFilePath(Path logFile) {
Modified:
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java?rev=1125222&r1=1125221&r2=1125222&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java
Fri May 20 03:44:23 2011
@@ -104,4 +104,6 @@ public interface JTConfig extends MRConf
public static final String JT_USER_NAME =
"mapreduce.jobtracker.kerberos.principal";
public static final String JT_KEYTAB_FILE =
"mapreduce.jobtracker.keytab.file";
+ public static final String PRIVATE_ACTIONS_KEY =
+ "mapreduce.jobtracker.webinterface.trusted";
}
Modified:
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java?rev=1125222&r1=1125221&r2=1125222&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
Fri May 20 03:44:23 2011
@@ -509,6 +509,9 @@ public class ConfigUtil {
new String[] {org.apache.hadoop.mapred.pipes.Submitter.PARTITIONER});
Configuration.addDeprecation("mapred.pipes.user.inputformat",
new String[] {org.apache.hadoop.mapred.pipes.Submitter.INPUT_FORMAT});
+
+ Configuration.addDeprecation("webinterface.private.actions",
+ new String[]{JTConfig.PRIVATE_ACTIONS_KEY});
}
}
Modified:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java?rev=1125222&r1=1125221&r2=1125222&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/mapred/TestWebUIAuthorization.java
Fri May 20 03:44:23 2011
@@ -674,7 +674,7 @@ public class TestWebUIAuthorization exte
props.setProperty("dfs.permissions.enabled", "false");
- props.setProperty(JSPUtil.PRIVATE_ACTIONS_KEY, "true");
+ props.setProperty(JTConfig.PRIVATE_ACTIONS_KEY, "true");
props.setProperty(MRJobConfig.SETUP_CLEANUP_NEEDED, "false");
props.setProperty(MRConfig.MR_SUPERGROUP, "superGroup");
props.setProperty(MRConfig.MR_ADMINS, mrAdminUser + " " + mrAdminGroup);
