(accumulo) branch elasticity updated: Allow a status of Successful when popping FATE repos (#4302)

[cs...@apache.org]

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

cshannon 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 d39d304c5d Allow a status of Successful when popping FATE repos (#4302)
d39d304c5d is described below

commit d39d304c5dea88e6316854880e6812532d781792
Author: Christopher L. Shannon <cs...@apache.org>
AuthorDate: Mon Feb 26 11:54:28 2024 -0500

    Allow a status of Successful when popping FATE repos (#4302)
    
    When FATE cleans up transactions that are successful, it will check the
    auto_clean flag and if set will delete the transaction. But if it is
    false or not set then it will iterate over all the repos and call pop to
    remove them to save space so we need to add SUCCESSFUL to the allowed
    statuses for pop, along with FAILED_IN_PROGRESS.
    
    This closes #4300
---
 .../accumulo/core/fate/accumulo/AccumuloStore.java    |  4 ++--
 .../accumulo/test/fate/accumulo/AccumuloStoreIT.java  | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java b/core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java
index 8ae222c61c..0d65f3e5d1 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/accumulo/AccumuloStore.java
@@ -361,8 +361,8 @@ public class AccumuloStore<T> extends AbstractFateStore<T> {
       verifyReserved(true);
 
       Optional<Integer> top = findTop();
-      top.ifPresent(
-          t -> newMutator(fateId).requireStatus(TStatus.FAILED_IN_PROGRESS).deleteRepo(t).mutate());
+      top.ifPresent(t -> newMutator(fateId)
+          .requireStatus(TStatus.FAILED_IN_PROGRESS, TStatus.SUCCESSFUL).deleteRepo(t).mutate());
     }
 
     @Override
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java b/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java
index a501526cba..785b52b290 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/accumulo/AccumuloStoreIT.java
@@ -38,7 +38,7 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.FateStore;
-import org.apache.accumulo.core.fate.ReadOnlyFateStore;
+import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 import org.apache.accumulo.core.fate.accumulo.AccumuloStore;
 import org.apache.accumulo.core.fate.accumulo.schema.FateSchema;
 import org.apache.accumulo.harness.SharedMiniClusterBase;
@@ -143,8 +143,8 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
     }
 
     private void testOperationWithStatuses(Runnable beforeOperation, Executable operation,
-        Set<ReadOnlyFateStore.TStatus> acceptableStatuses) throws Exception {
-      for (ReadOnlyFateStore.TStatus status : ReadOnlyFateStore.TStatus.values()) {
+        Set<TStatus> acceptableStatuses) throws Exception {
+      for (TStatus status : TStatus.values()) {
         // Run any needed setup for the operation before each iteration
         beforeOperation.run();
 
@@ -164,7 +164,7 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
     public void push() throws Exception {
       testOperationWithStatuses(() -> {}, // No special setup needed for push
           () -> txStore.push(new FateIT.TestRepo("testOp")),
-          Set.of(ReadOnlyFateStore.TStatus.IN_PROGRESS, ReadOnlyFateStore.TStatus.NEW));
+          Set.of(TStatus.IN_PROGRESS, TStatus.NEW));
     }
 
     @Test
@@ -172,28 +172,27 @@ public class AccumuloStoreIT extends SharedMiniClusterBase {
       testOperationWithStatuses(() -> {
         // Setup for pop: Ensure there something to pop by first pushing
         try {
-          injectStatus(client, tableName, fateId, ReadOnlyFateStore.TStatus.NEW);
+          injectStatus(client, tableName, fateId, TStatus.NEW);
           txStore.push(new FateIT.TestRepo("testOp"));
         } catch (Exception e) {
           throw new RuntimeException("Failed to setup for pop", e);
         }
-      }, txStore::pop, Set.of(ReadOnlyFateStore.TStatus.FAILED_IN_PROGRESS));
+      }, txStore::pop, Set.of(TStatus.FAILED_IN_PROGRESS, TStatus.SUCCESSFUL));
     }
 
     @Test
     public void delete() throws Exception {
       testOperationWithStatuses(() -> {}, // No special setup needed for delete
           txStore::delete,
-          Set.of(ReadOnlyFateStore.TStatus.NEW, ReadOnlyFateStore.TStatus.SUBMITTED,
-              ReadOnlyFateStore.TStatus.SUCCESSFUL, ReadOnlyFateStore.TStatus.FAILED));
+          Set.of(TStatus.NEW, TStatus.SUBMITTED, TStatus.SUCCESSFUL, TStatus.FAILED));
     }
   }
 
   /**
    * Inject a status into the status col of the fate store table for a given transaction id.
    */
-  private void injectStatus(ClientContext client, String table, FateId fateId,
-      ReadOnlyFateStore.TStatus status) throws TableNotFoundException {
+  private void injectStatus(ClientContext client, String table, FateId fateId, TStatus status)
+      throws TableNotFoundException {
     try (BatchWriter writer = client.createBatchWriter(table)) {
       Mutation mutation = new Mutation(new Text("tx_" + fateId.getHexTid()));
       FateSchema.TxColumnFamily.STATUS_COLUMN.put(mutation, new Value(status.name()));