(accumulo) branch elasticity updated: removes consitency check in GC wal scan (#4140)

[kt...@apache.org]

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

kturner 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 e63a3f7a7a removes consitency check in GC wal scan (#4140)
e63a3f7a7a is described below

commit e63a3f7a7a79fa08b688cfa677a656fb94c238cc
Author: Keith Turner <kt...@apache.org>
AuthorDate: Tue Jan 9 16:23:05 2024 -0500

    removes consitency check in GC wal scan (#4140)
    
    The GC Wal scan was doing consitency checking and filtering which caused
    a runtime excecption that prevented wal GC.  Consistency checking is not
    needed becasue a tablet with a wal will not split or merge. Prior to the
    change in 5c454e12a144e3543175d2cbc0b54bc0900749b1 consistency checking
    was not done.  It was added w/o a specific reason so removing instead of
    removing filtering. Fixing GC for wals fixes VolumeIT which was failing
    because no GC was happening.
---
 .../java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java   | 6 +++---
 test/src/main/java/org/apache/accumulo/test/VolumeIT.java           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 3c93187239..c4403365ca 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -85,11 +85,11 @@ public class GarbageCollectWriteAheadLogs {
     this.walMarker = new WalStateManager(context);
     this.store = () -> Iterators.concat(
         context.getAmple().readTablets().forLevel(DataLevel.ROOT).filter(new HasWalsFilter())
-            .fetch(LOCATION, LAST, LOGS, PREV_ROW, SUSPEND).checkConsistency().build().iterator(),
+            .fetch(LOCATION, LAST, LOGS, PREV_ROW, SUSPEND).build().iterator(),
         context.getAmple().readTablets().forLevel(DataLevel.METADATA).filter(new HasWalsFilter())
-            .fetch(LOCATION, LAST, LOGS, PREV_ROW, SUSPEND).checkConsistency().build().iterator(),
+            .fetch(LOCATION, LAST, LOGS, PREV_ROW, SUSPEND).build().iterator(),
         context.getAmple().readTablets().forLevel(DataLevel.USER).filter(new HasWalsFilter())
-            .fetch(LOCATION, LAST, LOGS, PREV_ROW, SUSPEND).checkConsistency().build().iterator());
+            .fetch(LOCATION, LAST, LOGS, PREV_ROW, SUSPEND).build().iterator());
   }
 
   /**
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
index 2e7dd8a5b0..11a5362847 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
@@ -69,6 +69,7 @@ import org.apache.accumulo.core.metadata.schema.DataFileValue;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.init.Initialize;
@@ -333,6 +334,7 @@ public class VolumeIT extends ConfigurableMacBase {
               }
             }
             log.warn("Unexpected volume " + entry.getKey() + " (" + entry.getValue() + ")");
+            UtilWaitThread.sleep(100);
             continue retry;
           }
         } catch (WalMarkerException e) {