[accumulo] 01/02: Merge remote-tracking branch 'upstream/2.1'

[edcoleman]

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

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

commit 4e3f89129885368b2e0197fd63ee95a31c7d38b2
Merge: 4b1c1b17eb a8cc689a77
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Thu Jul 6 17:43:43 2023 +0000

    Merge remote-tracking branch 'upstream/2.1'

 .../compactions/InternalCompactionExecutor.java    |   1 +
 .../accumulo/tserver/tablet/CompactableImpl.java   |  14 +--
 .../tablet/CompactableImplFileManagerTest.java     |   2 +-
 .../org/apache/accumulo/test/LargeSplitRowIT.java  |   2 +-
 .../java/org/apache/accumulo/test/TestIngest.java  |  10 ++
 .../test/compaction/ExternalCompaction4_IT.java    | 135 +++++++++++++++++++++
 .../accumulo/test/conf/PropStoreConfigIT.java      |  48 ++++----
 .../accumulo/test/conf/util/ZooPropEditorIT.java   |  37 +++---
 .../accumulo/test/functional/CompactionIT.java     |  78 ++++++++++++
 .../test/functional/ErrorThrowingIterator.java     | 106 ++++++++++++++++
 .../test/functional/KerberosRenewalIT.java         |   3 +-
 .../accumulo/test/functional/ReadWriteIT.java      |   6 +
 .../apache/accumulo/test/shell/ShellServerIT.java  |   8 +-
 .../java/org/apache/accumulo/test/util/Wait.java   |  69 +++++++++--
 14 files changed, 448 insertions(+), 71 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
index 3a7c4e78c0,f020657bed..1df536b0ba
--- 
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
@@@ -1290,10 -1301,9 +1288,9 @@@ public class CompactableImpl implement
        stats = CompactableUtils.compact(tablet, job, cInfo, compactEnv, 
compactFiles, tmpFileName);
  
        newFile = CompactableUtils.bringOnline(tablet.getDatafileManager(), 
cInfo, stats,
 -          compactFiles, allFiles, kind, tmpFileName);
 +          compactFiles, tmpFileName);
  
        TabletLogger.compacted(getExtent(), job, newFile.orElse(null));
- 
        successful = true;
      } catch (CompactionCanceledException cce) {
        log.debug("Compaction canceled {} ", getExtent());
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 18528c1391,efa7d3ffc9..928810fbe1
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@@ -23,8 -22,8 +23,9 @@@ import static org.apache.accumulo.core.
  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.assertTrue;
 +import static org.junit.jupiter.api.Assertions.fail;
  
  import java.io.IOException;
  import java.time.Duration;
@@@ -34,8 -32,8 +35,9 @@@ import java.util.HashSet
  import java.util.List;
  import java.util.Map;
  import java.util.Map.Entry;
+ import java.util.NoSuchElementException;
  import java.util.Objects;
 +import java.util.Set;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
  import java.util.concurrent.atomic.AtomicBoolean;