You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/06/17 00:10:00 UTC
svn commit: r1136708 - in /hadoop/common/branches/branch-0.20-security-204:
./ src/core/org/apache/hadoop/http/ src/core/org/apache/hadoop/jmx/
src/test/org/apache/hadoop/jmx/
Author: omalley
Date: Thu Jun 16 22:09:59 2011
New Revision: 1136708
URL: http://svn.apache.org/viewvc?rev=1136708&view=rev
Log:
HADOOP-7144. Expose JMX metrics via JSON servlet. (Robert Joseph Evans via
cdouglas)
Added:
hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/jmx/
- copied from r1131290, hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/jmx/
hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/jmx/JMXJsonServlet.java
- copied unchanged from r1131290, hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/jmx/JMXJsonServlet.java
hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/jmx/package-info.java
- copied unchanged from r1131290, hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/jmx/package-info.java
hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/jmx/
- copied from r1131290, hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/jmx/
hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/jmx/TestJMXJsonServlet.java
- copied unchanged from r1131290, hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/jmx/TestJMXJsonServlet.java
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/http/HttpServer.java
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1136708&r1=1136707&r2=1136708&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 22:09:59 2011
@@ -86,6 +86,9 @@ Release 0.20.204.0 - unreleased
IMPROVEMENTS
+ HADOOP-7144. Expose JMX metrics via JSON servlet. (Robert Joseph Evans via
+ cdouglas)
+
MAPREDUCE-2524. Port reduce failure reporting semantics from trunk, to
fail faulty maps more aggressively. (Thomas Graves via cdouglas)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 22:09:59 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1131299,1131737,1134140
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1131290,1131299,1131737,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1133133,1133274,1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/http/HttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/http/HttpServer.java?rev=1136708&r1=1136707&r2=1136708&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/http/HttpServer.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/http/HttpServer.java Thu Jun 16 22:09:59 2011
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.jmx.JMXJsonServlet;
import org.apache.hadoop.log.LogLevel;
import org.apache.hadoop.security.Krb5AndCertsSslSocketConnector;
import org.apache.hadoop.security.UserGroupInformation;
@@ -259,6 +260,7 @@ public class HttpServer implements Filte
// set up default servlets
addServlet("stacks", "/stacks", StackServlet.class);
addServlet("logLevel", "/logLevel", LogLevel.Servlet.class);
+ addServlet("jmx", "/jmx", JMXJsonServlet.class);
}
public void addContext(Context ctxt, boolean isFiltered)