This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f3531d8c2612cc2ca97fa6070b654fe996a196ab
Merge: 875f5e72b7 e981057599
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Sep 13 17:59:03 2024 +0000
Merge branch '2.1' into 3.1
.../core/client/admin/InstanceOperations.java | 1 +
.../file/blockfile/impl/ScanCacheProvider.java | 19 +--
.../accumulo/core/logging/LoggingBlockCache.java | 131 +++++++++++++++++++++
.../accumulo/core/summary/SummaryReader.java | 6 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 60 +++++++---
.../rest/compactions/external/ECResource.java | 17 +--
.../accumulo/tserver/tablet/SnapshotTablet.java | 15 +--
.../org/apache/accumulo/tserver/tablet/Tablet.java | 9 --
.../apache/accumulo/tserver/tablet/TabletBase.java | 9 ++
src/build/ci/find-unapproved-chars.sh | 2 +-
.../org/apache/accumulo/test/CloseScannerIT.java | 9 +-
.../org/apache/accumulo/test/ZombieScanIT.java | 61 +++++++---
.../test/functional/ScanSessionTimeOutIT.java | 11 +-
.../apache/accumulo/test/functional/ScannerIT.java | 71 ++++++++---
14 files changed, 322 insertions(+), 99 deletions(-)
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 5a1f81a30b,9957164153..257fe8c76f
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -57,14 -58,11 +57,15 @@@ import org.apache.accumulo.core.fate.zo
import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
import org.apache.accumulo.core.gc.thrift.GCMonitorService;
import org.apache.accumulo.core.gc.thrift.GCStatus;
+import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
+import org.apache.accumulo.core.lock.ServiceLockData;
+import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
import org.apache.accumulo.core.manager.thrift.ManagerClientService;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
-import org.apache.accumulo.core.master.thrift.TableInfo;
-import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.core.manager.thrift.TableInfo;
+import org.apache.accumulo.core.manager.thrift.TabletServerStatus;
+ import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.metrics.MetricsInfo;
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
@@@ -100,7 -104,7 +103,8 @@@ import org.glassfish.jersey.servlet.Ser
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import com.google.common.base.Suppliers;
+import com.google.common.net.HostAndPort;
/**
* Serve manager statistics with an embedded web server.
diff --cc test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
index adb2f04947,bd0be182c0..0461ba53ec
--- a/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
@@@ -18,7 -18,9 +18,10 @@@
*/
package org.apache.accumulo.test;
+ import static
org.apache.accumulo.core.client.ScannerBase.ConsistencyLevel.IMMEDIATE;
+import static org.apache.accumulo.core.metrics.Metric.SCAN_ZOMBIE_THREADS;
+ import static org.apache.accumulo.minicluster.ServerType.SCAN_SERVER;
+ import static org.apache.accumulo.minicluster.ServerType.TABLET_SERVER;
import static org.apache.accumulo.test.functional.ScannerIT.countActiveScans;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
index 79cdbbe279,8b7bdaa7d4..fb7911d46d
---
a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
@@@ -18,7 -18,8 +18,8 @@@
*/
package org.apache.accumulo.test.functional;
-import static
org.apache.accumulo.core.util.UtilWaitThread.sleepUninterruptibly;
+import static java.util.concurrent.TimeUnit.SECONDS;
+ import static org.apache.accumulo.minicluster.ServerType.TABLET_SERVER;
import static org.apache.accumulo.test.functional.ScannerIT.countActiveScans;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@@ -120,12 -122,12 +121,12 @@@ public class ScanSessionTimeOutIT exten
verify(iter, 0, 200);
// There should be a scan session open since not all data was read
from the iterator
- assertEquals(1L, countActiveScans(c, tableName));
+ assertEquals(1L, countActiveScans(c, TABLET_SERVER, tableName));
// sleep three times the session timeout
- sleepUninterruptibly(9, TimeUnit.SECONDS);
+ Thread.sleep(SECONDS.toMillis(9));
// The scan session should have timed out and the next read should
create a new one
- assertEquals(0L, countActiveScans(c, tableName));
+ assertEquals(0L, countActiveScans(c, TABLET_SERVER, tableName));
verify(iter, 200, 50000);
// Reading part of the data in the range should cause a new scan
session to be created
diff --cc test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index c5069b5323,48db8bbe29..fae0aa42e7
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@@ -37,7 -43,8 +43,7 @@@ import org.apache.accumulo.core.data.Mu
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
- import org.apache.accumulo.harness.AccumuloClusterHarness;
-import org.apache.accumulo.core.util.UtilWaitThread;
+ import org.apache.accumulo.minicluster.ServerType;
import org.apache.accumulo.test.CloseScannerIT;
import org.apache.accumulo.test.util.Wait;
import org.junit.jupiter.api.Test;
