Merge branch '3.1'

Author: ddanielr

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java

@@ -357,6 +357,9 @@ private long loadFiles(TableId tableId, Path bulkDir, LoadMappingIterator loadMa
 
     Text startRow = loadMapEntry.getKey().prevEndRow();
 
+    String fmtTid = fateId.getTxUUIDStr();
+    log.trace("{}: Starting bulk load at row: {}", fmtTid, startRow);
+
     Loader loader = new Loader();
     long t1;
     loader.start(bulkDir, manager, tableId, fateId, bulkInfo.setTime);
@@ -378,16 +381,22 @@ private long loadFiles(TableId tableId, Path bulkDir, LoadMappingIterator loadMa
       t1 = System.currentTimeMillis();
       while (lmi.hasNext()) {
         loadMapEntry = lmi.next();
-        List<TabletMetadata> tablets = findOverlappingTablets(loadMapEntry.getKey(), tabletIter);
+        List<TabletMetadata> tablets =
+            findOverlappingTablets(fmtTid, loadMapEntry.getKey(), tabletIter);
         loader.load(tablets, loadMapEntry.getValue());
       }
     }
 
+    log.trace("{}: Completed Finding Overlapping Tablets", fmtTid);
+
     long sleepTime = loader.finish();
     if (sleepTime > 0) {
-      long scanTime = Math.min(System.currentTimeMillis() - t1, 30000);
+      log.trace("{}: Tablet Max Sleep is {}", fmtTid, sleepTime);
+      long scanTime = Math.min(System.currentTimeMillis() - t1, 30_000);
+      log.trace("{}: Scan time is {}", fmtTid, scanTime);
       sleepTime = Math.max(sleepTime, scanTime * 2);
     }
+    log.trace("{}: Sleeping for {}ms", fmtTid, sleepTime);
     return sleepTime;
   }
 
@@ -397,7 +406,7 @@ private long loadFiles(TableId tableId, Path bulkDir, LoadMappingIterator loadMa
   /**
    * Find all the tablets within the provided bulk load mapping range.
    */
-  private List<TabletMetadata> findOverlappingTablets(KeyExtent loadRange,
+  private List<TabletMetadata> findOverlappingTablets(String fmtTid, KeyExtent loadRange,
       Iterator<TabletMetadata> tabletIter) {
 
     TabletMetadata currTablet = null;
@@ -406,11 +415,13 @@ private List<TabletMetadata> findOverlappingTablets(KeyExtent loadRange,
 
       List<TabletMetadata> tablets = new ArrayList<>();
       currTablet = tabletIter.next();
+      log.trace("{}: Finding Overlapping Tablets for row: {}", fmtTid, currTablet.getExtent());
 
       int cmp;
 
       // skip tablets until we find the prevEndRow of loadRange
       while ((cmp = PREV_COMP.compare(currTablet.getPrevEndRow(), loadRange.prevEndRow())) < 0) {
+        log.trace("{}: Skipping tablet: {}", fmtTid, currTablet.getExtent());
         currTablet = tabletIter.next();
       }
 
@@ -426,6 +437,7 @@ private List<TabletMetadata> findOverlappingTablets(KeyExtent loadRange,
       // adding tablets to the list until the endRow matches the loadRange
       while ((cmp = END_COMP.compare(currTablet.getEndRow(), loadRange.endRow())) < 0) {
         currTablet = tabletIter.next();
+        log.trace("{}: Adding tablet: {} to overlapping list", fmtTid, currTablet.getExtent());
         tablets.add(currTablet);
       }
 

test/src/main/resources/log4j2-test.properties

@@ -142,14 +142,20 @@ logger.38.level = debug
 logger.39.name = org.apache.accumulo.manager.Manager
 logger.39.level = trace
 
-logger.40.name = org.apache.accumulo.tablet
+logger.40.name = org.apache.accumulo.manager.tableOps.bulkVer2.LoadFiles
 logger.40.level = trace
 
-logger.41.name = org.apache.accumulo.server.metadata
+logger.41.name = org.apache.accumulo.server.util.checkCommand.CheckRunner
 logger.41.level = trace
 
-logger.42.name = org.apache.accumulo.server.util.checkCommand.CheckRunner
+logger.42.name = org.apache.accumulo.tablet
 logger.42.level = trace
 
+logger.43.name = org.apache.accumulo.server.metadata
+logger.43.level = trace
+
+logger.44.name = org.apache.accumulo.server.util.checkCommand.CheckRunner
+logger.44.level = trace
+
 rootLogger.level = debug
 rootLogger.appenderRef.console.ref = STDOUT