(accumulo) 01/01: Merge branch '2.1'

[kturner]

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

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

commit 6abb607d12216fd38057df66154df02bdb854f0c
Merge: a03d364632 751a110efe
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Thu Nov 30 16:19:24 2023 -0500

    Merge branch '2.1'

 .../org/apache/accumulo/tserver/tablet/Tablet.java |  10 +-
 .../apache/accumulo/test/functional/BulkNewIT.java | 147 +++++++++++++++++++++
 2 files changed, 152 insertions(+), 5 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index fc373ae30c,3f7eebe95f..1b6ba2f3cf
--- 
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
@@@ -1770,9 -1787,14 +1770,14 @@@ public class Tablet extends TabletBase 
      try {
        tabletServer.updateBulkImportState(files, BulkImportState.LOADING);
  
 -      var storedTabletFile = getDatafileManager().importMapFiles(tid, 
entries, setTime);
 -      lastMapFileImportTime = System.currentTimeMillis();
 +      getDatafileManager().importDataFiles(tid, entries, setTime);
 +      lastDataFileImportTime = System.currentTimeMillis();
  
+       synchronized (this) {
+         // only mark the bulk import a success if no exception was thrown
+         bulkImported.computeIfAbsent(tid, k -> new 
ArrayList<>()).addAll(fileMap.keySet());
+       }
+ 
        if (isSplitPossible()) {
          getTabletServer().executeSplit(this);
        } else {
diff --cc test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
index 5280d279dc,a8aebd2e25..6a0448749c
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
@@@ -61,7 -71,9 +71,10 @@@ import org.apache.accumulo.core.data.co
  import org.apache.accumulo.core.file.FileOperations;
  import org.apache.accumulo.core.file.FileSKVWriter;
  import org.apache.accumulo.core.file.rfile.RFile;
+ import org.apache.accumulo.core.metadata.MetadataTable;
+ import org.apache.accumulo.core.metadata.StoredTabletFile;
 +import org.apache.accumulo.core.metadata.UnreferencedTabletFile;
+ import org.apache.accumulo.core.metadata.schema.MetadataSchema;
  import org.apache.accumulo.core.metadata.schema.TabletMetadata;
  import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
  import org.apache.accumulo.core.security.Authorizations;