[accumulo] 01/02: Merge branch '2.1'

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 73844448d38a6833d7fcf518f36d686eb804ef81
Merge: de73759c24 b41427dc18
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri May 5 19:33:16 2023 +0000

    Merge branch '2.1'

 .../TabletServerBatchReaderIterator.java           |  10 +-
 .../core/metadata/schema/TabletMetadata.java       |  10 ++
 .../accumulo/server/manager/state/Assignment.java  |  14 ++-
 .../server/manager/state/MetaDataStateStore.java   |   8 +-
 .../server/manager/state/UnassignedTablet.java     |  84 +++++++++++++++++
 .../server/manager/state/ZooTabletStateStore.java  |   8 +-
 .../accumulo/server/util/ManagerMetadataUtil.java  |  14 +--
 .../manager/state/RootTabletStateStoreTest.java    |   4 +-
 .../server/util/ManagerMetadataUtilTest.java       | 102 +++++++++++++++++++++
 .../java/org/apache/accumulo/manager/Manager.java  |   9 +-
 .../accumulo/manager/TabletGroupWatcher.java       |  51 ++++++-----
 .../apache/accumulo/tserver/AssignmentHandler.java |   3 +-
 .../accumulo/test/functional/SplitRecoveryIT.java  |   2 +-
 .../apache/accumulo/test/manager/MergeStateIT.java |   2 +-
 .../accumulo/test/performance/NullTserver.java     |   2 +-
 15 files changed, 274 insertions(+), 49 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
index 4dbfbffab8,963a9f2c4a..a2b549139b
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
@@@ -69,13 -71,15 +71,14 @@@ import org.apache.accumulo.core.securit
  import org.apache.accumulo.core.spi.scan.ScanServerAttempt;
  import org.apache.accumulo.core.spi.scan.ScanServerSelections;
  import org.apache.accumulo.core.spi.scan.ScanServerSelector;
 +import org.apache.accumulo.core.tabletscan.thrift.ScanServerBusyException;
 +import org.apache.accumulo.core.tabletscan.thrift.TSampleNotPresentException;
 +import org.apache.accumulo.core.tabletscan.thrift.TabletScanClientService;
  import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
 -import org.apache.accumulo.core.tabletserver.thrift.ScanServerBusyException;
 -import 
org.apache.accumulo.core.tabletserver.thrift.TSampleNotPresentException;
 -import org.apache.accumulo.core.tabletserver.thrift.TabletScanClientService;
  import org.apache.accumulo.core.trace.TraceUtil;
  import org.apache.accumulo.core.util.ByteBufferUtil;
 -import org.apache.accumulo.core.util.HostAndPort;
  import org.apache.accumulo.core.util.OpTimer;
+ import org.apache.accumulo.core.util.Retry;
  import org.apache.thrift.TApplicationException;
  import org.apache.thrift.TException;
  import org.apache.thrift.transport.TTransportException;