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 e60a5607583416283677a2b3f65a7669e211a31a
Merge: ef824fdb00 0ad4d3e7b0
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Nov 14 13:46:32 2024 +0000
Merge branch '3.1'
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 2d7108d4da,32d08169bc..6e2fed76af
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -1118,14 -1177,8 +1118,14 @@@ public enum Property
"Interval at which Compactors will check to see if the currently
executing compaction"
+ " should be cancelled. This checks for situations like was the
tablet deleted (split "
+ " and merge do this), was the table deleted, was a user
compaction canceled, etc.",
- "4.0.0"),
+ "2.1.4"),
@Experimental
+ COMPACTOR_PORTSEARCH("compactor.port.search", "true", PropertyType.BOOLEAN,
+ "If the compactor.port.client ports are in use, search higher ports
until one is available.",
+ "2.1.0"),
+ @Experimental
+ COMPACTOR_CLIENTPORT("compactor.port.client", "9133", PropertyType.PORT,
+ "The port used for handling client connections on the compactor
servers.", "2.1.0"),
COMPACTOR_MIN_JOB_WAIT_TIME("compactor.wait.time.job.min", "1s",
PropertyType.TIMEDURATION,
"The minimum amount of time to wait between checks for the next
compaction job, backing off"
+ "exponentially until COMPACTOR_MAX_JOB_WAIT_TIME is reached.",
