(accumulo) 01/01: Merge branch 'main' into elasticity

[dlmarion]

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

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

commit 73344781c30d63d4b19e4c84b835af2942db8fee
Merge: 695e86d4e1 62d5551ffa
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Dec 6 16:47:59 2023 +0000

    Merge branch 'main' into elasticity

 .../org/apache/accumulo/test/ScanServerIT.java     | 37 ++++++++--------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
index 8d815b96a7,ad6a38ea72..75e791480f
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
@@@ -20,28 -20,13 +20,27 @@@ package org.apache.accumulo.test
  
  import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
  import static org.junit.jupiter.api.Assertions.assertEquals;
- import static org.junit.jupiter.api.Assertions.assertFalse;
  import static org.junit.jupiter.api.Assertions.assertNotNull;
  import static org.junit.jupiter.api.Assertions.assertThrows;
 +import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
 +import static org.junit.jupiter.api.Assertions.fail;
  
 +import java.time.Duration;
 +import java.util.ArrayList;
 +import java.util.Collection;
  import java.util.Collections;
 +import java.util.List;
  import java.util.Objects;
  import java.util.Properties;
 +import java.util.SortedSet;
 +import java.util.TreeSet;
 +import java.util.concurrent.ExecutionException;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.Executors;
 +import java.util.concurrent.Future;
  import java.util.concurrent.TimeUnit;
 +import java.util.stream.Collectors;
 +import java.util.stream.IntStream;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.Accumulo;
@@@ -50,9 -35,9 +49,10 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.IteratorSetting;
  import org.apache.accumulo.core.client.Scanner;
  import org.apache.accumulo.core.client.ScannerBase.ConsistencyLevel;
+ import org.apache.accumulo.core.client.TableOfflineException;
  import org.apache.accumulo.core.client.TimedOutException;
  import org.apache.accumulo.core.client.admin.NewTableConfiguration;
 +import org.apache.accumulo.core.client.admin.TabletHostingGoal;
  import org.apache.accumulo.core.conf.ClientProperty;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Range;
@@@ -70,14 -47,10 +70,13 @@@ import org.apache.accumulo.harness.Mini
  import org.apache.accumulo.harness.SharedMiniClusterBase;
  import org.apache.accumulo.minicluster.ServerType;
  import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 +import org.apache.accumulo.server.metadata.ServerAmpleImpl;
  import org.apache.accumulo.test.functional.ReadWriteIT;
  import org.apache.accumulo.test.functional.SlowIterator;
 +import org.apache.accumulo.test.util.Wait;
 +import org.apache.hadoop.io.Text;
  import org.junit.jupiter.api.AfterAll;
  import org.junit.jupiter.api.BeforeAll;
- import org.junit.jupiter.api.Disabled;
  import org.junit.jupiter.api.Tag;
  import org.junit.jupiter.api.Test;
  import org.junit.jupiter.api.Timeout;