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

[ddanielr]

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

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

commit d64dda4c660659d78b80fc1e7d8585560a1e365c
Merge: 644594adff 1d274eb60c
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Fri Apr 11 19:47:22 2025 +0000

    Merge branch '2.1'

 .../apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index 2f4bc54c2a,603de073cc..161fcca2b5
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@@ -103,11 -102,11 +103,11 @@@ class LoadFiles extends ManagerRepo 
    }
  
    @Override
 -  public long isReady(long tid, Manager manager) throws Exception {
 -    log.info("Starting for {} (tid = {})", bulkInfo.sourceDir, 
FateTxId.formatTid(tid));
 +  public long isReady(FateId fateId, Manager manager) throws Exception {
-     log.info("Starting bulk import for {} (tid = {})", bulkInfo.sourceDir, 
fateId);
++    log.info("Starting for {} (tid = {})", bulkInfo.sourceDir, fateId);
      if (manager.onlineTabletServers().isEmpty()) {
 -      log.warn("There are no tablet server to process bulkDir import, waiting 
(tid = "
 -          + FateTxId.formatTid(tid) + ")");
 +      log.warn("There are no tablet server to process bulkDir import, waiting 
(fateId = " + fateId
 +          + ")");
        return 100;
      }
      VolumeManager fs = manager.getVolumeManager();
@@@ -400,10 -454,10 +400,10 @@@
  
      Text startRow = loadMapEntry.getKey().prevEndRow();
  
 -    String fmtTid = FateTxId.formatTid(tid);
 +    String fmtTid = fateId.getTxUUIDStr();
-     log.trace("{}: Starting bulk load at row: {}", fmtTid, startRow);
+     log.trace("{}: Started loading files at row: {}", fmtTid, startRow);
  
 -    loader.start(bulkDir, manager, tid, bulkInfo.setTime);
 +    loader.start(bulkDir, manager, bulkInfo.tableId, fateId, 
bulkInfo.setTime);
  
      ImportTimingStats importTimingStats = new ImportTimingStats();
      Timer timer = Timer.startNew();
@@@ -441,11 -495,11 +441,11 @@@
  
      if (importTimingStats.callCount > 0) {
        log.debug(
-           "Bulk import stats for {} (tid = {}): processed {} tablets in {} 
calls which took {}ms ({} nanos). Skipped {} iterations which took {}ms ({} 
nanos) or {}% of the processing time.",
+           "Stats for {} (tid = {}): processed {} tablets in {} calls which 
took {}ms ({} nanos). Skipped {} iterations which took {}ms ({} nanos) or {}% 
of the processing time.",
 -          bulkInfo.sourceDir, FateTxId.formatTid(tid), 
importTimingStats.tabletCount,
 -          importTimingStats.callCount, totalProcessingTime.toMillis(),
 -          totalProcessingTime.toNanos(), importTimingStats.wastedIterations,
 -          importTimingStats.totalWastedTime.toMillis(), 
importTimingStats.totalWastedTime.toNanos(),
 +          bulkInfo.sourceDir, fateId, importTimingStats.tabletCount, 
importTimingStats.callCount,
 +          totalProcessingTime.toMillis(), totalProcessingTime.toNanos(),
 +          importTimingStats.wastedIterations, 
importTimingStats.totalWastedTime.toMillis(),
 +          importTimingStats.totalWastedTime.toNanos(),
            (importTimingStats.totalWastedTime.toNanos() * 100) / 
totalProcessingTime.toNanos());
      }