[accumulo] branch main updated: Rename some confusing GC methods (#2686)

[mmiller]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 7af40badbe Rename some confusing GC methods (#2686)
7af40badbe is described below

commit 7af40badbe25718fa5050bf883582e23d7b76631
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue May 10 10:46:57 2022 -0400

    Rename some confusing GC methods (#2686)
---
 server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java  |  3 ++-
 .../org/apache/accumulo/gc/GarbageCollectionAlgorithm.java | 14 +++++---------
 .../apache/accumulo/gc/GarbageCollectionEnvironment.java   |  5 +++--
 .../java/org/apache/accumulo/gc/GarbageCollectionTest.java |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java 
b/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
index a4a80d99d4..b864bb6cca 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
@@ -161,7 +161,8 @@ public class GCRun implements GarbageCollectionEnvironment {
   }
 
   @Override
-  public void delete(SortedMap<String,String> confirmedDeletes) throws 
TableNotFoundException {
+  public void deleteConfirmedCandidates(SortedMap<String,String> 
confirmedDeletes)
+      throws TableNotFoundException {
     final VolumeManager fs = context.getVolumeManager();
     var metadataLocation = level == Ample.DataLevel.ROOT
         ? context.getZooKeeperRoot() + " for " + RootTable.NAME : 
level.metaTable();
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 5dd6705d6e..2f4b5c85cc 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -110,7 +110,6 @@ public class GarbageCollectionAlgorithm {
   }
 
   private SortedMap<String,String> makeRelative(Collection<String> candidates) 
{
-
     SortedMap<String,String> ret = new TreeMap<>();
 
     for (String candidate : candidates) {
@@ -127,10 +126,7 @@ public class GarbageCollectionAlgorithm {
     return ret;
   }
 
-  /**
-   * Return the number of BLIP flags seen.
-   */
-  private void confirmDeletes(GarbageCollectionEnvironment gce,
+  private void removeCandidatesInUse(GarbageCollectionEnvironment gce,
       SortedMap<String,String> candidateMap) {
     Iterator<Reference> iter = gce.getReferences().iterator();
     while (iter.hasNext()) {
@@ -281,7 +277,7 @@ public class GarbageCollectionAlgorithm {
     Span confirmDeletesSpan = TraceUtil.startSpan(this.getClass(), 
"confirmDeletes");
     try (Scope scope = confirmDeletesSpan.makeCurrent()) {
       blips = removeBlipCandidates(gce, candidateMap);
-      confirmDeletes(gce, candidateMap);
+      removeCandidatesInUse(gce, candidateMap);
       confirmDeletesFromReplication(gce, candidateMap);
     } catch (Exception e) {
       TraceUtil.setException(confirmDeletesSpan, e, true);
@@ -292,11 +288,11 @@ public class GarbageCollectionAlgorithm {
     return blips;
   }
 
-  private void deleteConfirmed(GarbageCollectionEnvironment gce,
+  private void deleteConfirmedCandidates(GarbageCollectionEnvironment gce,
       SortedMap<String,String> candidateMap) throws IOException, 
TableNotFoundException {
     Span deleteSpan = TraceUtil.startSpan(this.getClass(), "deleteFiles");
     try (Scope deleteScope = deleteSpan.makeCurrent()) {
-      gce.delete(candidateMap);
+      gce.deleteConfirmedCandidates(candidateMap);
     } catch (Exception e) {
       TraceUtil.setException(deleteSpan, e, true);
       throw e;
@@ -342,7 +338,7 @@ public class GarbageCollectionAlgorithm {
     long blips = confirmDeletesTrace(gce, candidateMap);
     gce.incrementInUseStat(origSize - candidateMap.size());
 
-    deleteConfirmed(gce, candidateMap);
+    deleteConfirmedCandidates(gce, candidateMap);
 
     return blips;
   }
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index add7c7f819..38b6ac5456 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -95,12 +95,13 @@ public interface GarbageCollectionEnvironment {
 
   /**
    * Delete the given files from the provided {@link Map} of relative path to 
absolute path for each
-   * file that should be deleted
+   * file that should be deleted. The candidates should already be confirmed 
for deletion.
    *
    * @param candidateMap
    *          A Map from relative path to absolute path for files to be 
deleted.
    */
-  void delete(SortedMap<String,String> candidateMap) throws 
TableNotFoundException;
+  void deleteConfirmedCandidates(SortedMap<String,String> candidateMap)
+      throws TableNotFoundException;
 
   /**
    * Delete a table's directory if it is empty.
diff --git 
a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java 
b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 35a8797f39..88f29ad707 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -82,7 +82,7 @@ public class GarbageCollectionTest {
     }
 
     @Override
-    public void delete(SortedMap<String,String> candidateMap) {
+    public void deleteConfirmedCandidates(SortedMap<String,String> 
candidateMap) {
       deletes.addAll(candidateMap.values());
       this.candidates.removeAll(candidateMap.values());
     }