Recreate TabletsMetadata iterator when file ranges are not contiguous

In the Bulk Import v2 LoadFiles step a single TabletsMetadata
object was used to map a tables tablets to a set of bulk import
files. In the case where a small percentage of tablets were
involved in the bulk import a majority of the tables tablets
would still be evaluated. In the case where bulk imports were
not importing into contiguous tablets the code would just
iterate over the tables tablets until it found the next starting
point.

This change recreates the TabletMetadata object when a set of
files is not going to start at the next tablet in the table. A
likely better way to achieve the same thing would be to reset
the range on the underlying Scanner and create a new iterator,
but the TabletsMetadata object does not expose the Scanner. This
change also closes the TabletsMetadata objects which was not
being done previously.

Related to apache#5201

Author: dlmarion

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

@@ -324,13 +324,11 @@ private long loadFiles(TableId tableId, Path bulkDir, LoadMappingIterator loadMa
     Map.Entry<KeyExtent,Bulk.Files> loadMapEntry = lmi.peek();
 
     Text startRow = loadMapEntry.getKey().prevEndRow();
-
     String fmtTid = FateTxId.formatTid(tid);
     log.trace("{}: Starting bulk load at row: {}", fmtTid, startRow);
 
-    Iterator<TabletMetadata> tabletIter =
-        TabletsMetadata.builder(manager.getContext()).forTable(tableId).overlapping(startRow, null)
-            .checkConsistency().fetch(PREV_ROW, LOCATION, LOADED).build().iterator();
+    TabletsMetadata tm = TabletsMetadata.builder(manager.getContext()).forTable(tableId)
+        .overlapping(startRow, null).checkConsistency().fetch(PREV_ROW, LOCATION, LOADED).build();
 
     Loader loader;
     if (bulkInfo.tableState == TableState.ONLINE) {
@@ -342,12 +340,22 @@ private long loadFiles(TableId tableId, Path bulkDir, LoadMappingIterator loadMa
     loader.start(bulkDir, manager, tid, bulkInfo.setTime);
 
     long t1 = System.currentTimeMillis();
+    KeyExtent prevLastExtent = null; // KeyExtent of last tablet from prior loadMapEntry
     while (lmi.hasNext()) {
       loadMapEntry = lmi.next();
-      List<TabletMetadata> tablets =
-          findOverlappingTablets(fmtTid, loadMapEntry.getKey(), tabletIter);
+      KeyExtent loadMapKey = loadMapEntry.getKey();
+      if (prevLastExtent != null && !loadMapKey.isPreviousExtent(prevLastExtent)) {
+        tm.close();
+        log.trace("Advance to next prevLastExtent: {}", loadMapKey.prevEndRow());
+        tm = TabletsMetadata.builder(manager.getContext()).forTable(tableId)
+            .overlapping(loadMapKey.prevEndRow(), null).checkConsistency()
+            .fetch(PREV_ROW, LOCATION, LOADED).build();
+      }
+      List<TabletMetadata> tablets = findOverlappingTablets(fmtTid, loadMapKey, tm.iterator());
       loader.load(tablets, loadMapEntry.getValue());
+      prevLastExtent = tablets.get(tablets.size() - 1).getExtent();
     }
+    tm.close();
 
     log.trace("{}: Completed Finding Overlapping Tablets", fmtTid);