You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/12/04 19:24:51 UTC
[1/2] accumulo git commit: Port over minc and scan metrics to use
extended MutableStats
Repository: accumulo
Updated Branches:
refs/heads/metrics2-backwardscompat f3f8dc467 -> e199f1b1d
Port over minc and scan metrics to use extended MutableStats
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f01370d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f01370d3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f01370d3
Branch: refs/heads/metrics2-backwardscompat
Commit: f01370d3da59f5dca77bf232117e67ae6001a031
Parents: f3f8dc4
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 4 13:09:26 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 4 13:09:26 2014 -0500
----------------------------------------------------------------------
.../metrics/Metrics2TabletServerMinCMetrics.java | 13 +++++++++++--
.../metrics/Metrics2TabletServerScanMetrics.java | 15 +++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f01370d3/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java
----------------------------------------------------------------------
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 f152d48..8facaeb 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
@@ -23,6 +23,7 @@ import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+import org.apache.hadoop.metrics2.lib.MutableStat;
/**
*
@@ -31,15 +32,23 @@ public class Metrics2TabletServerMinCMetrics implements Metrics, MetricsSource {
private final MetricsSystem system;
private final MetricsRegistry registry;
+ private final MutableStat activeMinc, queuedMinc;
public Metrics2TabletServerMinCMetrics(MetricsSystem system) {
this.system = system;
this.registry = new MetricsRegistry(Interns.info("MinorCompactionMetrics", "TabletServer Minor Compaction Metrics"));
+
+ activeMinc = registry.newStat(TabletServerMinCMetricsMBean.minc, "Minor compactions", "Ops", "Count", true);
+ queuedMinc = registry.newStat(TabletServerMinCMetricsMBean.queue, "Queued minor compactions", "Ops", "Count", true);
}
@Override
- public void add(String name, long time) {
- registry.add(name, time);
+ public void add(String name, long value) {
+ if (TabletServerMinCMetricsMBean.minc.equals(name)) {
+ activeMinc.add(value);
+ } else if (TabletServerMinCMetricsMBean.queue.equals(name)) {
+ queuedMinc.add(value);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f01370d3/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java
----------------------------------------------------------------------
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 d54e689..e2ab687 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
@@ -23,6 +23,7 @@ import org.apache.hadoop.metrics2.MetricsSource;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.lib.Interns;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+import org.apache.hadoop.metrics2.lib.MutableStat;
/**
*
@@ -31,15 +32,25 @@ public class Metrics2TabletServerScanMetrics implements Metrics, MetricsSource {
private final MetricsSystem system;
private final MetricsRegistry registry;
+ private final MutableStat scans, resultsPerScan;
Metrics2TabletServerScanMetrics(MetricsSystem system) {
this.system = system;
this.registry = new MetricsRegistry(Interns.info("ScanMetrics", "TabletServer Scan Metrics"));
+
+ scans = registry.newStat(TabletServerScanMetricsMBean.scan, "Scans", "Ops", "Count", true);
+ resultsPerScan = registry.newStat(TabletServerScanMetricsMBean.resultSize, "Results per scan", "Ops", "Count", true);
}
@Override
- public void add(String name, long time) {
- registry.add(name, time);
+ public void add(String name, long value) {
+ if (TabletServerScanMetricsMBean.scan.equals(name)) {
+ scans.add(value);
+ } else if (TabletServerScanMetricsMBean.resultSize.equals(name)) {
+ resultsPerScan.add(value);
+ } else {
+ throw new RuntimeException("Could not find metric to update for name " + name);
+ }
}
@Override
[2/2] accumulo git commit: Switch entries and entriesInMem from stat
to a gauge.
Posted by el...@apache.org.
Switch entries and entriesInMem from stat to a gauge.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e199f1b1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e199f1b1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e199f1b1
Branch: refs/heads/metrics2-backwardscompat
Commit: e199f1b1dcfc75757fbf1f9682d2fb3b075d0325
Parents: f01370d
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 4 13:24:25 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 4 13:24:25 2014 -0500
----------------------------------------------------------------------
.../tserver/metrics/Metrics2TabletServerMetrics.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e199f1b1/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
----------------------------------------------------------------------
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 70f2a2e..8d47ba7 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
@@ -40,18 +40,19 @@ public class Metrics2TabletServerMetrics implements Metrics, MetricsSource {
private final MetricsSystem system;
private final MetricsRegistry registry;
- private final MutableStat entries, entriesInMemory, filesPerTablet;
- private final MutableGaugeLong activeMajcs, queuedMajcs, activeMincs, queuedMincs, onlineTablets, openingTablets, unopenedTablets, queries, totalMincs;
+ private final MutableStat filesPerTablet;
+ private final MutableGaugeLong entries, entriesInMemory, activeMajcs, queuedMajcs, activeMincs, queuedMincs, onlineTablets, openingTablets, unopenedTablets,
+ queries, totalMincs;
Metrics2TabletServerMetrics(TabletServer tserver, MetricsSystem system) {
this.tserver = tserver;
this.system = system;
this.registry = new MetricsRegistry(Interns.info("TabletServerMetrics", "General TabletServer Metrics"));
- entries = registry.newStat(ENTRIES, "Number of entries", "Ops", "Count");
- entriesInMemory = registry.newStat(ENTRIES_IN_MEM, "Number of entries in memory", "Ops", "Count");
filesPerTablet = registry.newStat(FILES_PER_TABLET, "Number of files per tablet", "Ops", "Files", true);
+ entries = registry.newGauge(Interns.info(ENTRIES, "Number of entries"), 0l);
+ entriesInMemory = registry.newGauge(Interns.info(ENTRIES_IN_MEM, "Number of entries in memory"), 0l);
activeMajcs = registry.newGauge(Interns.info(ACTIVE_MAJCS, "Number of active major compactions"), 0l);
queuedMajcs = registry.newGauge(Interns.info(QUEUED_MAJCS, "Number of queued major compactions"), 0l);
activeMincs = registry.newGauge(Interns.info(ACTIVE_MINCS, "Number of active minor compactions"), 0l);
@@ -79,10 +80,10 @@ public class Metrics2TabletServerMetrics implements Metrics, MetricsSource {
}
protected void snapshot() {
- entries.add(getEntries());
- entriesInMemory.add(getEntriesInMemory());
filesPerTablet.add((long) getAverageFilesPerTablet());
+ entries.set(getEntries());
+ entriesInMemory.set(getEntriesInMemory());
activeMajcs.set(getMajorCompactions());
queuedMajcs.set(getMajorCompactionsQueued());
activeMincs.set(getMinorCompactions());