This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f660cc30094614a1eb34e1f7b3d3fb426ff4bca2 Merge: bb48f00de9 d4a55591dc Author: Dave Marion <[email protected]> AuthorDate: Thu Jun 1 11:32:26 2023 +0000 Merge branch '2.1' .../org/apache/accumulo/core/conf/Property.java | 1 + .../miniclusterImpl/MiniAccumuloClusterImpl.java | 1 + .../miniclusterImpl/MiniAccumuloConfigImpl.java | 21 ++++ .../accumulo/server/fs/VolumeManagerImpl.java | 4 + .../main/java/org/apache/accumulo/gc/GCRun.java | 10 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 4 +- .../accumulo/gc/SimpleGarbageCollectorTest.java | 6 +- .../test/functional/GarbageCollectorTrashBase.java | 125 +++++++++++++++++++++ .../functional/GarbageCollectorTrashDefaultIT.java | 88 +++++++++++++++ .../GarbageCollectorTrashDisabledIT.java | 86 ++++++++++++++ ...GarbageCollectorTrashEnabledCustomPolicyIT.java | 114 +++++++++++++++++++ .../functional/GarbageCollectorTrashEnabledIT.java | 84 ++++++++++++++ test/src/main/resources/log4j2-test.properties | 3 + 13 files changed, 542 insertions(+), 5 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index 25786601c5,2f5a6201ea..7c39d4c7d1 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -733,8 -873,12 +733,9 @@@ public enum Property "The listening port for the garbage collector's monitor service", "1.3.5"), GC_DELETE_THREADS("gc.threads.delete", "16", PropertyType.COUNT, "The number of threads used to delete RFiles and write-ahead logs", "1.3.5"), + @Deprecated(since = "2.1.1", forRemoval = true) GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not use the Trash, even if it is configured.", "1.5.0"), - @Deprecated(since = "2.1.0", forRemoval = true) - GC_TRACE_PERCENT("gc.trace.percent", "0.01", PropertyType.FRACTION, - "Percent of gc cycles to trace", "1.7.0"), GC_SAFEMODE("gc.safemode", "false", PropertyType.BOOLEAN, "Provides listing of files to be deleted but does not delete any files", "2.1.0"), GC_USE_FULL_COMPACTION("gc.post.metadata.action", "flush", PropertyType.GC_POST_ACTION,
