This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 97f9cf80cbc89fefb46aa96ae1cec56af7aeff02
Merge: b701918ec0 e69456534b
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Fri Jan 26 19:55:38 2024 +0000
Merge remote-tracking branch 'upstream/2.1'
.../accumulo/tserver/tablet/CompactableImpl.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
index 28d6b11977,89c68c5b55..4d29f953eb
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java
@@@ -101,13 -106,17 +101,13 @@@ public class CompactableImpl implement
private final FileManager fileMgr;
- private Set<CompactionJob> runningJobs = new HashSet<>();
+ private final Set<CompactionJob> runningJobs = new HashSet<>();
private volatile boolean compactionRunning = false;
- private Supplier<Set<CompactionServiceId>> servicesInUse;
+ private final Supplier<Set<CompactionServiceId>> servicesInUse;
- private Set<CompactionServiceId> servicesUsed = new
ConcurrentSkipListSet<>();
+ private final Set<CompactionServiceId> servicesUsed = new
ConcurrentSkipListSet<>();
- enum ChopSelectionStatus {
- SELECTING, SELECTED, NOT_ACTIVE, MARKING
- }
-
// status of special compactions
enum FileSelectionStatus {
NEW, SELECTING, SELECTED, RESERVED, NOT_ACTIVE, CANCELED
