You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2017/12/07 03:43:22 UTC
[GitHub] ctubbsii closed pull request #291: ACCUMULO-4693: Add instance-specific ProcessName to Hadoop2 metrics
ctubbsii closed pull request #291: ACCUMULO-4693: Add instance-specific ProcessName to Hadoop2 metrics
URL: https://github.com/apache/accumulo/pull/291
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/Metrics2ThriftMetrics.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
index d16689970f..dc1c0cb684 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
@@ -20,6 +20,7 @@
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.impl.MsInfo;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
@@ -39,6 +40,7 @@
this.name = THRIFT_NAME + ",sub=" + serverName;
this.desc = "Thrift Server Metrics - " + serverName + " " + threadName;
this.registry = new MetricsRegistry(Interns.info(name, desc));
+ this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
}
@Override
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..356768df9d 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,41 @@
*/
package org.apache.accumulo.server.metrics;
+import org.apache.commons.lang.StringUtils;
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 String processName = "Unknown";
+
+ public static void configure(String serviceName) {
+ MetricsSystemHelper.processName = serviceName;
+ String serviceInstance = System.getProperty("accumulo.metrics.service.instance", "");
+ if (StringUtils.isNotBlank(serviceInstance)) {
+ MetricsSystemHelper.processName += 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 1c437d5d06..b2391d421e 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
@@ -92,6 +92,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;
@@ -151,6 +152,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(SimpleGarbageCollector.class.getSimpleName());
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 77dde82045..43c5c0750c 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(Master.class.getSimpleName());
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);
DistributedTrace.enable(hostname, app, conf.getConfiguration());
diff --git a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
index 2739827264..5e167e16b8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/metrics/Metrics2ReplicationMetrics.java
@@ -28,12 +28,14 @@
import org.apache.accumulo.core.replication.ReplicationTarget;
import org.apache.accumulo.master.Master;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.server.replication.ReplicationUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.impl.MsInfo;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableQuantiles;
@@ -66,7 +68,8 @@
pathModTimes = new HashMap<>();
- registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
+ this.registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
+ this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
replicationUtil = new ReplicationUtil(master);
replicationQueueTimeQuantiles = registry.newQuantiles(REPLICATION_QUEUE_TIME_QUANTILES, "Replication queue time quantiles in milliseconds", "ops",
"latency", 600);
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 fbd12840d3..a35518e46d 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
@@ -87,6 +87,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;
@@ -433,6 +434,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(Monitor.class.getSimpleName());
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 dd7ca12184..e2983bcd05 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(TraceServer.class.getSimpleName());
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 962bd69e47..fef942eb1b 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
@@ -183,6 +183,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;
@@ -2957,6 +2958,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(TabletServer.class.getSimpleName());
Accumulo.init(fs, conf, app);
final TabletServer server = new TabletServer(conf, fs);
server.config(hostname);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
index b470a8f961..d63b90c61f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
@@ -17,11 +17,13 @@
package org.apache.accumulo.tserver.metrics;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.accumulo.tserver.TabletServer;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.impl.MsInfo;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
@@ -44,6 +46,7 @@
util = new TabletServerMetricsUtil(tserver);
this.system = system;
this.registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
+ this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
entries = registry.newGauge(Interns.info(ENTRIES, "Number of entries"), 0l);
entriesInMemory = registry.newGauge(Interns.info(ENTRIES_IN_MEM, "Number of entries in memory"), 0l);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java
index cd06c8eade..3ad27b3556 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java
@@ -17,10 +17,12 @@
package org.apache.accumulo.tserver.metrics;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.impl.MsInfo;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableStat;
@@ -40,6 +42,7 @@
Metrics2TabletServerMinCMetrics(MetricsSystem system) {
this.system = system;
this.registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
+ this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
activeMinc = registry.newStat(MINC, "Minor compactions", "Ops", "Count", true);
queuedMinc = registry.newStat(QUEUE, "Queued minor compactions", "Ops", "Count", true);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java
index d2fc8714a3..4546b8f30f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java
@@ -17,10 +17,12 @@
package org.apache.accumulo.tserver.metrics;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.impl.MsInfo;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableStat;
@@ -39,6 +41,7 @@
Metrics2TabletServerScanMetrics(MetricsSystem system) {
this.system = system;
this.registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
+ this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
scans = registry.newStat(SCAN, "Scans", "Ops", "Count", true);
resultsPerScan = registry.newStat(RESULT_SIZE, "Results per scan", "Ops", "Count", true);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
index e1c91c675f..2f71847842 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
@@ -17,10 +17,12 @@
package org.apache.accumulo.tserver.metrics;
import org.apache.accumulo.server.metrics.Metrics;
+import org.apache.accumulo.server.metrics.MetricsSystemHelper;
import org.apache.hadoop.metrics2.MetricsCollector;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.impl.MsInfo;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.lib.MutableCounterLong;
@@ -42,6 +44,7 @@
Metrics2TabletServerUpdateMetrics(MetricsSystem system) {
this.system = system;
this.registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
+ this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
permissionErrorsCounter = registry.newCounter(Interns.info(PERMISSION_ERRORS, "Permission Errors"), 0l);
unknownTabletErrorsCounter = registry.newCounter(Interns.info(UNKNOWN_TABLET_ERRORS, "Unknown Tablet Errors"), 0l);
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services