Minor test fix

Author: asolomonC

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java

@@ -87,6 +87,7 @@
 @InterfaceAudience.Private
 public class IncrementalTableBackupClient extends TableBackupClient {
   private static final Logger LOG = LoggerFactory.getLogger(IncrementalTableBackupClient.class);
+  private static final String BULKLOAD_COLLECTOR_OUTPUT = "bulkload-collector-output";
 
   protected IncrementalTableBackupClient() {
   }
@@ -202,7 +203,7 @@ protected List<BulkLoad> handleBulkLoad(List<TableName> tablesToBackup,
       }
     } else {
       // Continuous incremental backup: run BulkLoadCollectorJob over backed-up WALs
-      Path collectorOutput = new Path(getBulkOutputDir(), "bulkload-collector-output");
+      Path collectorOutput = new Path(getBulkOutputDir(), BULKLOAD_COLLECTOR_OUTPUT);
       for (TableName table : tablesToBackup) {
         String walDirsCsv = String.join(",", tablesToWALFileList.get(table));
 

hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithContinuous.java

@@ -163,22 +163,17 @@ public void testIncrementalBackupCopyingBulkloadTillIncrCommittedWalTs() throws
       performBulkLoad("bulkPreIncr", methodName, tableName1);
       expectedRowCount += ROWS_IN_BULK_LOAD;
       assertEquals(expectedRowCount, TEST_UTIL.countRows(tableName1));
-      //assertEquals(1, systemTable.readBulkloadRows(List.of(tableName1)).size());
       assertTrue(systemTable.readBulkloadRows(List.of(tableName1)).isEmpty());
       loadTable(TEST_UTIL.getConnection().getTable(tableName1));
       Thread.sleep(15000);
 
       performBulkLoad("bulkPostIncr", methodName, tableName1);
-      //assertEquals(2, systemTable.readBulkloadRows(List.of(tableName1)).size());
       assertTrue(systemTable.readBulkloadRows(List.of(tableName1)).isEmpty());
 
       // Incremental backup
       String backup2 =
         backupTables(BackupType.INCREMENTAL, List.of(tableName1), BACKUP_ROOT_DIR, true);
       assertTrue(checkSucceeded(backup2));
-
-      // bulkPostIncr Bulkload entry should not be deleted post incremental backup
-      //assertEquals(1, systemTable.readBulkloadRows(List.of(tableName1)).size());
       assertTrue(systemTable.readBulkloadRows(List.of(tableName1)).isEmpty());
 
       TEST_UTIL.truncateTable(tableName1);