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

[kturner]

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

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

commit 81a2581ead2323326d2c89472922ff078ec42382
Merge: 0f060b9cb0 d925db128b
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Thu Mar 30 20:08:18 2023 -0400

    Merge remote-tracking branch 'upstream/1.10' into 2.1

 .../java/org/apache/accumulo/tserver/tablet/Tablet.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 5c4b7d40db,9cd5cbd968..fbdec25e97
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -43,11 -45,9 +44,10 @@@ import java.util.concurrent.ConcurrentS
  import java.util.concurrent.TimeUnit;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.concurrent.atomic.AtomicLong;
--import java.util.concurrent.atomic.AtomicReference;
  import java.util.concurrent.locks.Lock;
  import java.util.concurrent.locks.ReentrantLock;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.Durability;
@@@ -1400,10 -1875,12 +1404,12 @@@ public class Tablet extends TabletBase 
          }
  
          newComputation = new SplitComputations(files, midpoint, lastRow);
+ 
+         lastSplitComputation = new SoftReference<>(newComputation);
        } catch (IOException e) {
-         lastSplitComputation.set(null);
+         lastSplitComputation.clear();
          log.error("Failed to compute split information from files " + 
e.getMessage());
 -        return Optional.absent();
 +        return Optional.empty();
        } finally {
          splitComputationLock.unlock();
        }