This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 90821b115c90564004eb62625dab06864d4913be
Merge: b8089dd528 af53242538
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Nov 20 21:13:32 2023 -0500
Merge branch '2.1'
.../accumulo/core/metrics/MetricsProducer.java | 150 ++++++++++-----------
.../accumulo/tserver/tablet/CompactableImpl.java | 11 +-
.../tablet/CompactableImplFileManagerTest.java | 34 +++++
3 files changed, 117 insertions(+), 78 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
index a2aa7d6a9a,1a8d618ce4..7aea9a7a6c
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@@ -47,14 -47,7 +47,14 @@@ import io.micrometer.core.instrument.Me
* <tr>
* <td>N/A</td>
* <td>N/A</td>
- * <td>{@link #METRICS_LOW_MEMORY}</td>
++ * <td>{@value #METRICS_LOW_MEMORY}</td>
+ * <td>Guage</td>
+ * <td>reports 1 when process memory usage is above threshold, 0 when memory
is okay</td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
- * <td>{@link #METRICS_COMPACTOR_MAJC_STUCK}</td>
+ * <td>{@value #METRICS_COMPACTOR_MAJC_STUCK}</td>
* <td>LongTaskTimer</td>
* <td></td>
* </tr>
@@@ -431,20 -424,6 +431,20 @@@
* <td>Counter</td>
* <td></td>
* </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
- * <td>{@link #METRICS_SCAN_PAUSED_FOR_MEM}</td>
++ * <td>{@value #METRICS_SCAN_PAUSED_FOR_MEM}</td>
+ * <td>Counter</td>
+ * <td></td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
- * <td>{@link #METRICS_SCAN_RETURN_FOR_MEM}</td>
++ * <td>{@value #METRICS_SCAN_RETURN_FOR_MEM}</td>
+ * <td>Counter</td>
+ * <td></td>
+ * </tr>
* <!-- major compactions -->
* <tr>
* <td>{i|e}_{compactionServiceName}_{executor_name}_queued</td>
@@@ -484,11 -456,40 +484,11 @@@
* <td>Timer</td>
* <td></td>
* </tr>
- * <!-- replication -->
* <tr>
- * <td>ReplicationQueue</td>
- * <td>Stat</td>
- * <td>{@value #METRICS_REPLICATION_QUEUE}</td>
- * <td>Timer</td>
- * <td></td>
- * </tr>
- * <tr>
- * <td>ReplicationQueue10m</td>
- * <td>Quantiles</td>
- * <td>N/A</td>
- * <td>N/A</td>
- * <td></td>
- * </tr>
- * <tr>
- * <td>filesPendingReplication</td>
- * <td>Stat</td>
- * <td>{@value #METRICS_REPLICATION_PENDING_FILES}</td>
- * <td>Gauge</td>
* <td></td>
- * </tr>
- * <tr>
- * <td>maxReplicationThreads</td>
- * <td>Stat</td>
- * <td>{@value #METRICS_REPLICATION_THREADS}</td>
- * <td>Gauge</td>
* <td></td>
- * <td>{@link #METRICS_MINC_PAUSED}</td>
- * </tr>
- * <tr>
- * <td>numPeers</td>
- * <td>Stat</td>
- * <td>{@value #METRICS_REPLICATION_PEERS}</td>
- * <td>Gauge</td>
++ * <td>{@value #METRICS_MINC_PAUSED}</td>
+ * <td>Counter</td>
* <td></td>
* </tr>
* <!-- Updates (ingest) -->
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
index 8fe91dab5b,11722c100f..ce91f5d3ac
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
@@@ -872,11 -1081,10 +878,10 @@@ public class CompactableImpl implement
}
}
}
-
}
- static Collection<String> asFileNames(Set<StoredTabletFile> files) {
- return Collections2.transform(files, StoredTabletFile::getFileName);
+ static Collection<String> asMinimalString(Set<StoredTabletFile> files) {
+ return Collections2.transform(files, StoredTabletFile::toMinimalString);
}
@Override
