svn merge -c 1297248 from trunk to branch-0.23 FIXES MAPREDUCE-3964. ResourceManager does not have JVM metrics (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297250 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c0ecbbc7b4
commit
68e54b192d
|
@ -185,6 +185,9 @@ Release 0.23.2 - UNRELEASED
|
|||
MAPREDUCE-3009. Fixed node link on JobHistory webapp. (chackaravarthy via
|
||||
vinodkv)
|
||||
|
||||
MAPREDUCE-3964. ResourceManager does not have JVM metrics (Jason Lowe via
|
||||
bobby)
|
||||
|
||||
Release 0.23.1 - 2012-02-17
|
||||
|
||||
NEW FEATURES
|
||||
|
|
|
@ -27,7 +27,9 @@ import org.apache.commons.logging.Log;
|
|||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.classification.InterfaceAudience.Private;
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.metrics2.MetricsSystem;
|
||||
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
||||
import org.apache.hadoop.metrics2.source.JvmMetrics;
|
||||
import org.apache.hadoop.security.SecurityUtil;
|
||||
import org.apache.hadoop.util.ReflectionUtils;
|
||||
import org.apache.hadoop.util.StringUtils;
|
||||
|
@ -449,7 +451,8 @@ public class ResourceManager extends CompositeService implements Recoverable {
|
|||
}
|
||||
|
||||
startWepApp();
|
||||
DefaultMetricsSystem.initialize("ResourceManager");
|
||||
MetricsSystem ms = DefaultMetricsSystem.initialize("ResourceManager");
|
||||
JvmMetrics.create("ResourceManager", null, ms);
|
||||
try {
|
||||
rmDTSecretManager.startThreads();
|
||||
} catch(IOException ie) {
|
||||
|
|
Loading…
Reference in New Issue