(accumulo) branch elasticity updated: Fixed CompactionDriver after new column added to metadata (#4319)

[dlmarion]

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

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


The following commit(s) were added to refs/heads/elasticity by this push:
     new 0528a71586 Fixed CompactionDriver after new column added to metadata 
(#4319)
0528a71586 is described below

commit 0528a71586adcbf0696338ed7d32184ad7744b88
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Feb 28 13:33:36 2024 -0500

    Fixed CompactionDriver after new column added to metadata (#4319)
    
    CompactionDriver.cleanupTabletMetadata was not fetching the
    newly added metadata column USER_COMPACTION_REQUESTED causing
    CompactionExecutorIT and ExternalCompaction_2_IT to fail. The
    column was added in #4254.
---
 .../apache/accumulo/manager/tableOps/compact/CompactionDriver.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
index 4f61047749..9fee825488 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
@@ -342,10 +342,9 @@ class CompactionDriver extends ManagerRepo {
         }
       };
 
-      try (
-          var tablets = 
ample.readTablets().forTable(tableId).overlapping(startRow, endRow)
-              .fetch(PREV_ROW, COMPACTED, SELECTED).checkConsistency().build();
-          var tabletsMutator = 
ample.conditionallyMutateTablets(resultConsumer)) {
+      try (var tablets = 
ample.readTablets().forTable(tableId).overlapping(startRow, endRow)
+          .fetch(PREV_ROW, COMPACTED, SELECTED, 
USER_COMPACTION_REQUESTED).checkConsistency()
+          .build(); var tabletsMutator = 
ample.conditionallyMutateTablets(resultConsumer)) {
         Predicate<TabletMetadata> needsUpdate =
             tabletMetadata -> (tabletMetadata.getSelectedFiles() != null
                 && 
tabletMetadata.getSelectedFiles().getFateId().equals(fateId))