diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index 1f0c05eb823..bda42d4c4a4 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -958,7 +958,8 @@ private TabletMetadata commitCompaction(TCompactionStats stats, ExternalCompacti // ELASTICITY_TODO check return value and retry, could fail because of race conditions var result = tabletsMutator.process().get(extent); if (result.getStatus() == Ample.ConditionalResult.Status.ACCEPTED) { - // compaction was committed + // compaction was committed, mark the compaction input files for deletion + ctx.getAmple().putGcCandidates(extent.tableId(), ecm.getJobFiles()); break; } else { // compaction failed to commit, maybe something changed on the tablet so lets reread the diff --git a/test/src/main/java/org/apache/accumulo/test/GCRunIT.java b/test/src/main/java/org/apache/accumulo/test/GCRunIT.java index c57f4be4dca..dcc13d01121 100644 --- a/test/src/main/java/org/apache/accumulo/test/GCRunIT.java +++ b/test/src/main/java/org/apache/accumulo/test/GCRunIT.java @@ -151,7 +151,7 @@ public void forceMissingDirTest() throws Exception { * GCRun need to support injecting synthetic row data, or another solution is required. */ @Test - @Disabled("deleting prev row causes scan to fail before row read validation") + @Disabled("disabled since test creation, deleting prev row causes scan to fail before row read validation") public void forceMissingPrevRowTest() {} private void scanReferences(GCRun userGC) { diff --git a/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java b/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java index 9c17b4acb04..45bd1a5f7ab 100644 --- a/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java +++ b/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java @@ -39,10 +39,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.fs.RemoteIterator; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -@Disabled // ELASTICITY_TODO public class GarbageCollectWALIT extends ConfigurableMacBase { @Override diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index 5806537a073..04e71d9b02b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -79,7 +79,6 @@ import org.apache.hadoop.io.Text; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NoNodeException; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -129,7 +128,6 @@ private void killMacGc() throws ProcessNotFoundException, InterruptedException, } @Test - @Disabled // ELASTICITY_TODO public void gcTest() throws Exception { killMacGc(); final String table = "test_ingest"; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDefaultIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDefaultIT.java index 52b387b1b3c..a0707ea2f84 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDefaultIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashDefaultIT.java @@ -36,11 +36,9 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; // verify trash is not used with Hadoop defaults, since Trash is not enabled by default -@Disabled // ELASTICITY_TODO public class GarbageCollectorTrashDefaultIT extends GarbageCollectorTrashBase { @Override diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledIT.java index 1ba12d0a563..4e6b6fc1079 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledIT.java @@ -36,11 +36,9 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; // verify that trash is used if Hadoop is configured to use it -@Disabled // ELASTICITY_TODO public class GarbageCollectorTrashEnabledIT extends GarbageCollectorTrashBase { @Override diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledWithCustomPolicyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledWithCustomPolicyIT.java index 5874e6f122f..4fac07778d3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledWithCustomPolicyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorTrashEnabledWithCustomPolicyIT.java @@ -40,11 +40,9 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.TrashPolicyDefault; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; // verify that trash is used if Hadoop is configured to use it and that using a custom policy works -@Disabled // ELASTICITY_TODO public class GarbageCollectorTrashEnabledWithCustomPolicyIT extends GarbageCollectorTrashBase { public static class NoFlushFilesInTrashPolicy extends TrashPolicyDefault {