This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 4e519af Merge remote-tracking branch 'upstream/1.9'
add 90dc4d7 merge 1.9 fate metics changes to master
No new revisions were added by this update.
Summary of changes:
server/master/pom.xml | 4 +
.../master/metrics/fate/FateMetricValues.java | 131 ++++++---
.../accumulo/master/metrics/fate/FateMetrics.java | 140 +++++++--
.../master/metrics/fate/FateMetricValuesTest.java | 25 --
.../master/metrics/fate/FateMetricsTest.java | 315 +++++++++++++++++++++
.../master/metrics/fate/InMemTestCollector.java | 146 ++++++++++
.../metrics/fate/ZooKeeperTestingServer.java | 146 ++++++++++
.../src/test/resources/conf/accumulo-site.xml | 120 ++++++++
.../src/test/resources/conf/generic_logger.xml | 87 ++++++
.../src/test/resources/conf/monitor_logger.xml | 68 +++++
.../resources/hadoop-metrics2-accumulo.properties | 0
.../accumulo/test/functional/GcMetricsIT.java | 53 +++-
.../accumulo/test/functional/MasterMetricsIT.java | 302 ++++++++++++++++++++
.../accumulo/test/metrics/MetricsFileTailer.java | 97 +++++++
14 files changed, 1547 insertions(+), 87 deletions(-)
create mode 100644
server/master/src/test/java/org/apache/accumulo/master/metrics/fate/FateMetricsTest.java
create mode 100644
server/master/src/test/java/org/apache/accumulo/master/metrics/fate/InMemTestCollector.java
create mode 100644
server/master/src/test/java/org/apache/accumulo/master/metrics/fate/ZooKeeperTestingServer.java
create mode 100644 server/master/src/test/resources/conf/accumulo-site.xml
create mode 100644 server/master/src/test/resources/conf/generic_logger.xml
create mode 100644 server/master/src/test/resources/conf/monitor_logger.xml
copy {test/src/main =>
server/master/src/test}/resources/hadoop-metrics2-accumulo.properties (100%)
create mode 100644
test/src/main/java/org/apache/accumulo/test/functional/MasterMetricsIT.java
