[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 b3d7a613177be5a6d8a94fe2145c6d08106599cc
Merge: 639e83549f 81a2581ead
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Thu Mar 30 20:12:59 2023 -0400

    Merge branch '2.1'

 .../accumulo/core/metadata/schema/Ample.java       | 30 ++++++++
 .../accumulo/server/metadata/ServerAmpleImpl.java  | 89 +++++++++++++++++-----
 .../accumulo/server/util/MetadataTableUtil.java    | 48 ------------
 .../manager/tableOps/bulkVer1/BulkImport.java      |  3 +-
 .../tableOps/bulkVer1/CleanUpBulkImport.java       | 11 ++-
 .../manager/tableOps/bulkVer2/BulkImportMove.java  |  4 +-
 .../tableOps/bulkVer2/CleanUpBulkImport.java       | 11 ++-
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 16 ++--
 8 files changed, 120 insertions(+), 92 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 33c0a415a5,08871bd97b..15133cf345
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@@ -62,9 -61,8 +61,8 @@@ import org.apache.accumulo.core.data.Ra
  import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.data.Value;
  import org.apache.accumulo.core.dataImpl.KeyExtent;
- import org.apache.accumulo.core.fate.FateTxId;
 -import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
  import org.apache.accumulo.core.gc.ReferenceFile;
 +import org.apache.accumulo.core.lock.ServiceLock;
  import org.apache.accumulo.core.metadata.MetadataTable;
  import org.apache.accumulo.core.metadata.RootTable;
  import org.apache.accumulo.core.metadata.StoredTabletFile;
diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java
index d6822edf56,5ace9ccb6f..8f1e75782f
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/BulkImportMove.java
@@@ -103,11 -102,12 +102,10 @@@ class BulkImportMove extends ManagerRep
     */
    private void moveFiles(long tid, Path sourceDir, Path bulkDir, Manager 
manager,
        final VolumeManager fs, Map<String,String> renames) throws Exception {
-     MetadataTableUtil.addBulkLoadInProgressFlag(manager.getContext(),
+     manager.getContext().getAmple().addBulkLoadInProgressFlag(
          "/" + bulkDir.getParent().getName() + "/" + bulkDir.getName(), tid);
- 
      AccumuloConfiguration aConf = manager.getConfiguration();
 -    @SuppressWarnings("deprecation")
 -    int workerCount = aConf.getCount(
 -        aConf.resolve(Property.MANAGER_RENAME_THREADS, 
Property.MANAGER_BULK_RENAME_THREADS));
 +    int workerCount = aConf.getCount(Property.MANAGER_RENAME_THREADS);
      Map<Path,Path> oldToNewMap = new HashMap<>();
      String fmtTid = FateTxId.formatTid(tid);