[accumulo] branch master updated (44e2167 -> 0f78b2d)
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 44e2167 Reduce Path obj creation with VolumeUtil (#1498) add 0f78b2d Gc metrics cleanup merge from 1.9 (#1500) No new revisions were added by this update. Summary of changes: .../apache/accumulo/test/functional/GcMetricsIT.java| 17 + .../apache/accumulo/test/metrics/MetricsFileTailer.java | 6 +- 2 files changed, 22 insertions(+), 1 deletion(-)
[accumulo] branch 1.9 updated: Clean-up / remove comments in code from gc_metrics_backport when merged. (#1499)
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 60e293b Clean-up / remove comments in code from gc_metrics_backport
when merged. (#1499)
60e293b is described below
commit 60e293be2ac175e268d4aea51cb1811b50febeed
Author: EdColeman
AuthorDate: Tue Feb 4 14:40:17 2020 -0500
Clean-up / remove comments in code from gc_metrics_backport when merged.
(#1499)
---
.../accumulo/test/functional/GcMetricsIT.java | 22 --
.../accumulo/test/metrics/MetricsFileTailer.java | 13 -
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/GcMetricsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/GcMetricsIT.java
index 968226b..9bde363 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/GcMetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/GcMetricsIT.java
@@ -66,12 +66,8 @@ public class GcMetricsIT extends AccumuloClusterHarness {
Thread t1 = new Thread(gcTail);
t1.start();
-// used for manual jmx / jconsole validation - not for automated testing
-// try {
-// Thread.sleep(320_000);
-// } catch (InterruptedException ex) {
-// Thread.currentThread().interrupt();
-// }
+// uncomment for manual jmx / jconsole validation - not for automated
testing
+// manualValidationPause();
try {
@@ -108,6 +104,20 @@ public class GcMetricsIT extends AccumuloClusterHarness {
}
/**
+ * This method just sleeps for a while (test will likely time out) The pause
is to allow manual
+ * validation of metrics by connecting to the running gc process with
jconsole (or other jmx
+ * utility). It should not be used for automatic testing.
+ */
+ @SuppressWarnings("unused")
+ private void manualValidationPause() {
+try {
+ Thread.sleep(320_000);
+} catch (InterruptedException ex) {
+ Thread.currentThread().interrupt();
+}
+ }
+
+ /**
* Validate metrics for consistency withing a run cycle.
*
* @param values
diff --git
a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsFileTailer.java
b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsFileTailer.java
index 74a71ac..ea829f4 100644
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsFileTailer.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsFileTailer.java
@@ -124,21 +124,8 @@ public class MetricsFileTailer implements Runnable,
AutoCloseable {
String filename = propUrl.getFile();
- // Read data from this file
- // File propertiesFile = new File(filename);
-
- // ConfigurationFactory factory = new ConfigurationFactory(filename);
Configuration config = new PropertiesConfiguration(filename);
- // Configurations configs = new Configurations();
- //
- // Configuration config = configs.properties(new
File("config.properties"));
- // FileBasedConfigurationBuilder builder =
- // new
FileBasedConfigurationBuilder(PropertiesConfiguration.class)
- // .configure(params.fileBased().setFile(propertiesFile));
- //
- // Configuration config = builder.getConfiguration();
-
final Configuration sub = config.subset(metricsPrefix);
if (log.isTraceEnabled()) {
[accumulo] branch 1.9 updated (2c1c72f -> 0d7d976)
This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a change to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 2c1c72f Fix #1482 Increase timeouts on some slow ITs
add 0d7d976 Backport gc metrics to 1.9.x to use hadoop metrics2. (#1406)
No new revisions were added by this update.
Summary of changes:
.../org/apache/accumulo/core/conf/Property.java| 2 +
.../apache/accumulo/gc/SimpleGarbageCollector.java | 40 +++-
.../apache/accumulo/gc/metrics/GcCycleMetrics.java | 122 ++
.../org/apache/accumulo/gc/metrics/GcMetrics.java | 170 ++
.../accumulo/test/functional/GcMetricsIT.java | 242 +++
.../accumulo/test/metrics/MetricsFileTailer.java | 261 +
.../test/metrics/MetricsTestSinkProperties.java| 17 +-
.../resources/hadoop-metrics2-accumulo.properties | 11 +-
.../test/metrics/MetricsFileTailerTest.java| 106 +
9 files changed, 949 insertions(+), 22 deletions(-)
create mode 100644
server/gc/src/main/java/org/apache/accumulo/gc/metrics/GcCycleMetrics.java
create mode 100644
server/gc/src/main/java/org/apache/accumulo/gc/metrics/GcMetrics.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/functional/GcMetricsIT.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/metrics/MetricsFileTailer.java
copy core/src/main/java/org/apache/accumulo/core/conf/Sensitive.java =>
test/src/main/java/org/apache/accumulo/test/metrics/MetricsTestSinkProperties.java
(67%)
rename test/src/{test => main}/resources/hadoop-metrics2-accumulo.properties
(86%)
create mode 100644
test/src/test/java/org/apache/accumulo/test/metrics/MetricsFileTailerTest.java
[accumulo] branch master updated (8bdbb44 -> 44e2167)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 8bdbb44 Inline values always the same & drop unreachable code in tserver (#1494) add 44e2167 Reduce Path obj creation with VolumeUtil (#1498) No new revisions were added by this update. Summary of changes: .../accumulo/core/metadata/TabletFileUtil.java | 7 .../org/apache/accumulo/server/fs/VolumeUtil.java | 29 +++-- .../apache/accumulo/server/fs/VolumeUtilTest.java | 38 +++--- .../apache/accumulo/gc/SimpleGarbageCollector.java | 4 +-- .../accumulo/master/recovery/RecoveryManager.java | 4 +-- 5 files changed, 41 insertions(+), 41 deletions(-)
