This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a4b4f540c839631a54746f977fc565272b29c020
Merge: 227f84fb48 4b63ead6cb
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Thu Nov 9 11:31:45 2023 -0500
Merge branch '2.1'
.../tserver/compactions/CompactionManager.java | 28 ++-
.../tserver/compactions/CompactionService.java | 21 +-
.../compactions/ProvisionalCompactionPlanner.java | 67 ++++++
.../compaction/BadCompactionServiceConfigIT.java | 233 +++++++++++++++++++++
4 files changed, 334 insertions(+), 15 deletions(-)
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
index 9957eb1dee,be872a6ed9..bbabc9f262
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
@@@ -53,7 -54,9 +54,9 @@@ import org.apache.accumulo.tserver.tabl
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
++import com.github.benmanes.caffeine.cache.Cache;
++import com.github.benmanes.caffeine.cache.Caffeine;
import com.google.common.base.Preconditions;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Sets;
public class CompactionManager {
@@@ -187,6 -209,9 +199,8 @@@
Map<CompactionServiceId,CompactionService> tmpServices = new HashMap<>();
- unknownCompactionServiceErrorCache =
- CacheBuilder.newBuilder().expireAfterWrite(5, MINUTES).build();
++ unknownCompactionServiceErrorCache =
Caffeine.newBuilder().expireAfterWrite(5, MINUTES).build();
+
currentCfg.getPlanners().forEach((serviceName, plannerClassName) -> {
try {
tmpServices.put(CompactionServiceId.of(serviceName),
