ctubbsii closed pull request #290: ACCUMULO-4392: Expose metrics2 JVM metrics
URL: https://github.com/apache/accumulo/pull/290
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
index 42deb7e9bd..3cece4e10c 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
@@ -16,20 +16,65 @@
*/
package org.apache.accumulo.server.metrics;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.metrics2.source.JvmMetrics;
+import org.apache.hadoop.metrics2.source.JvmMetricsInfo;
/**
*
*/
public class MetricsSystemHelper {
+ private static Map<String,String> serviceNameMap = new HashMap<>();
+ private static String processName = "Unknown";
+
+ static {
+ serviceNameMap.put("master", "Master");
+ serviceNameMap.put("tserver", "TabletServer");
+ serviceNameMap.put("monitor", "Monitor");
+ serviceNameMap.put("gc", "GarbageCollector");
+ serviceNameMap.put("tracer", "Tracer");
+ serviceNameMap.put("shell", "Shell");
+ }
+
+ public static void configure(String application) {
+ String serviceName = application;
+ if (MetricsSystemHelper.serviceNameMap.containsKey(application)) {
+ serviceName = MetricsSystemHelper.serviceNameMap.get(application);
+ }
+
+ // a system property containing 'instance' can be used if more than one
TabletServer is started on a host
+ String serviceInstance = "";
+ if (serviceName.equals("TabletServer")) {
+ for (Map.Entry<Object,Object> p : System.getProperties().entrySet()) {
+ if (((String) p.getKey()).contains("instance")) {
+ // get rid of all non-alphanumeric characters and then prefix with a
-
+ serviceInstance = "-" + ((String)
p.getValue()).replaceAll("[^a-zA-Z0-9]", "");
+ break;
+ }
+ }
+ }
+ MetricsSystemHelper.processName = serviceName + serviceInstance;
+ }
+
+ public static String getProcessName() {
+ return MetricsSystemHelper.processName;
+ }
+
private static class MetricsSystemHolder {
// Singleton, rely on JVM to initialize the MetricsSystem only when it is
accessed.
private static final MetricsSystem metricsSystem =
DefaultMetricsSystem.initialize(Metrics.PREFIX);
}
public static MetricsSystem getInstance() {
+ if
(MetricsSystemHolder.metricsSystem.getSource(JvmMetricsInfo.JvmMetrics.name())
== null) {
+ JvmMetrics.create(getProcessName(), "",
MetricsSystemHolder.metricsSystem);
+ }
return MetricsSystemHolder.metricsSystem;
}
+
}
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 76292c8329..506f9a0089 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -90,6 +90,7 @@
import org.apache.accumulo.server.fs.VolumeManager.FileType;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.fs.VolumeUtil;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.rpc.RpcWrapper;
import org.apache.accumulo.server.rpc.ServerAddress;
@@ -150,6 +151,7 @@ public static void main(String[] args) throws
UnknownHostException, IOException
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
final VolumeManager fs = VolumeManagerImpl.get();
+ MetricsSystemHelper.configure(app);
Accumulo.init(fs, conf, app);
Opts opts = new Opts();
opts.parseArgs(app, args);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 165f926988..52e8d37d8c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -122,6 +122,7 @@
import org.apache.accumulo.server.master.state.ZooStore;
import org.apache.accumulo.server.master.state.ZooTabletStateStore;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.server.replication.ZooKeeperInitialization;
import org.apache.accumulo.server.rpc.RpcWrapper;
import org.apache.accumulo.server.rpc.ServerAddress;
@@ -1428,6 +1429,7 @@ public static void main(String[] args) throws Exception {
String hostname = opts.getAddress();
ServerConfigurationFactory conf = new
ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
+ MetricsSystemHelper.configure(app);
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);
DistributedTrace.enable(hostname, app, conf.getConfiguration());
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 42b9bd1a8b..d85a4d0574 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -86,6 +86,7 @@
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.server.monitor.LogService;
import org.apache.accumulo.server.problems.ProblemReports;
import org.apache.accumulo.server.problems.ProblemType;
@@ -434,6 +435,7 @@ public static void main(String[] args) throws Exception {
context = new AccumuloServerContext(config);
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
+ MetricsSystemHelper.configure(app);
Accumulo.init(fs, config, app);
Monitor monitor = new Monitor();
DistributedTrace.enable(hostname, app, config.getConfiguration());
diff --git
a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 2fe9a27f11..300b37e18c 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -58,6 +58,7 @@
import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.server.security.SecurityUtil;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
@@ -384,6 +385,7 @@ public static void main(String[] args) throws Exception {
Instance instance = HdfsZooInstance.getInstance();
ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
VolumeManager fs = VolumeManagerImpl.get();
+ MetricsSystemHelper.configure(app);
Accumulo.init(fs, conf, app);
String hostname = opts.getAddress();
TraceServer server = new TraceServer(conf, hostname);
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 1deb1cc243..f703c85348 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -182,6 +182,7 @@
import org.apache.accumulo.server.master.state.ZooTabletStateStore;
import org.apache.accumulo.server.master.tableOps.UserCompactionConfig;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.server.problems.ProblemReport;
import org.apache.accumulo.server.problems.ProblemReports;
import org.apache.accumulo.server.replication.ZooKeeperInitialization;
@@ -2958,6 +2959,7 @@ public static void main(String[] args) throws IOException
{
String hostname = opts.getAddress();
ServerConfigurationFactory conf = new
ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
+ MetricsSystemHelper.configure(app);
Accumulo.init(fs, conf, app);
final TabletServer server = new TabletServer(conf, fs);
server.config(hostname);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
