[accumulo] branch master updated (926402b -> 07f196d)

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


    from 926402b  Merge pull request #1172 from EdColeman/remove_legacy_metrics
     add 07f196d  Clean up and refactor metrics for maintainability (#1175)

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/accumulo/proxy/Proxy.java |  10 +-
 .../org/apache/accumulo/server/AbstractServer.java |  10 +-
 .../apache/accumulo/server/metrics/Metrics.java    |  84 +++++++-
 .../server/metrics/Metrics2ThriftMetrics.java      |  64 -------
 .../server/metrics/MetricsSystemHelper.java        |  54 ------
 .../{MetricsFactory.java => ThriftMetrics.java}    |  17 +-
 .../accumulo/server/metrics/ThriftMetricsKeys.java |  24 ---
 .../apache/accumulo/server/rpc/TServerUtils.java   |  88 ++++-----
 .../apache/accumulo/server/rpc/TimedProcessor.java |  32 ++--
 .../accumulo/server/util/TServerUtilsTest.java     |   8 +-
 .../apache/accumulo/gc/SimpleGarbageCollector.java |  12 +-
 .../java/org/apache/accumulo/master/Master.java    |  13 +-
 .../accumulo/master/metrics/MasterMetrics.java     |  12 +-
 .../master/metrics/MasterMetricsFactory.java       |  41 +---
 ...icationMetrics.java => ReplicationMetrics.java} |  70 ++-----
 .../{Metrics2FateMetrics.java => FateMetrics.java} |  74 ++-----
 ...etricsTest.java => ReplicationMetricsTest.java} |  16 +-
 .../org/apache/accumulo/tracer/TraceServer.java    |  14 +-
 .../org/apache/accumulo/tserver/TabletServer.java  | 102 ++++------
 .../metrics/Metrics2TabletServerMetrics.java       | 124 ------------
 .../metrics/Metrics2TabletServerMinCMetrics.java   |  76 --------
 .../metrics/Metrics2TabletServerScanMetrics.java   |  80 --------
 .../metrics/Metrics2TabletServerUpdateMetrics.java | 104 ----------
 ...verScanMetricsKeys.java => TServerMetrics.java} |  23 ++-
 .../tserver/metrics/TabletServerMetrics.java       |  89 +++++++++
 .../metrics/TabletServerMetricsFactory.java        |  65 -------
 .../tserver/metrics/TabletServerMetricsKeys.java   |  42 ----
 ...tricsKeys.java => TabletServerMinCMetrics.java} |  28 ++-
 ...tricsKeys.java => TabletServerScanMetrics.java} |  41 ++--
 .../tserver/metrics/TabletServerUpdateMetrics.java |  81 ++++++++
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 212 +++++++++++++--------
 .../accumulo/test/functional/ZombieTServer.java    |   4 +-
 .../accumulo/test/performance/NullTserver.java     |   6 +-
 33 files changed, 636 insertions(+), 1084 deletions(-)
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/metrics/Metrics2ThriftMetrics.java
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsSystemHelper.java
 rename server/base/src/main/java/org/apache/accumulo/server/metrics/{MetricsFactory.java => ThriftMetrics.java} (68%)
 delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/metrics/ThriftMetricsKeys.java
 copy core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletDeletedException.java => server/master/src/main/java/org/apache/accumulo/master/metrics/MasterMetrics.java (73%)
 rename server/master/src/main/java/org/apache/accumulo/master/metrics/{Metrics2ReplicationMetrics.java => ReplicationMetrics.java} (67%)
 rename server/master/src/main/java/org/apache/accumulo/master/metrics/fate/{Metrics2FateMetrics.java => FateMetrics.java} (51%)
 rename server/master/src/test/java/org/apache/accumulo/master/metrics/{Metrics2ReplicationMetricsTest.java => ReplicationMetricsTest.java} (87%)
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMinCMetrics.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerScanMetrics.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
 rename server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/{TabletServerScanMetricsKeys.java => TServerMetrics.java} (52%)
 create mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMetrics.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMetricsFactory.java
 delete mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMetricsKeys.java
 rename server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/{TabletServerMinCMetricsKeys.java => TabletServerMinCMetrics.java} (55%)
 rename server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/{TabletServerUpdateMetricsKeys.java => TabletServerScanMetrics.java} (50%)
 create mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerUpdateMetrics.java