This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit cd98475009ec143c7cb3fbaf9bd3e973f52b5ef2
Merge: d739ab6ad9 530beaeaa9
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Mon Dec 23 19:57:40 2024 +0000
Merge branch '2.1' into 3.1
.../apache/accumulo/core/util/compaction/RunningCompactionInfo.java | 4 ++--
.../main/resources/org/apache/accumulo/monitor/resources/js/ec.js | 1 -
.../accumulo/test/compaction/ExternalCompactionProgressIT.java | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --cc
test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
index 278c8a4e96,38105d5b4b..6825f9e0ee
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
@@@ -18,10 -18,8 +18,10 @@@
*/
package org.apache.accumulo.test.compaction;
+import static
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
- import static java.util.concurrent.TimeUnit.NANOSECONDS;
+ import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static
org.apache.accumulo.core.util.UtilWaitThread.sleepUninterruptibly;
+import static org.apache.accumulo.core.metrics.Metric.COMPACTOR_ENTRIES_READ;
+import static
org.apache.accumulo.core.metrics.Metric.COMPACTOR_ENTRIES_WRITTEN;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.QUEUE1;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.compact;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.createTable;
