This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
from c4b6c10eb2 Merge branch 'main' into elasticity add 28778bff3f Partially moves compactions into the manager (#3460) No new revisions were added by this update. Summary of changes: assemble/bin/accumulo-cluster | 13 +- .../org/apache/accumulo/core/conf/Property.java | 2 +- .../core/manager/state/TabletManagement.java | 2 +- .../core/metadata/CompactableFileImpl.java | 2 + .../accumulo/core/metadata/schema/Ample.java | 10 + .../schema/ExternalCompactionFinalState.java | 1 + .../core/spi/compaction/CompactionExecutorId.java | 1 + .../util/compaction/CompactionServicesConfig.java | 17 +- .../server/compaction/CompactionJobGenerator.java | 272 +++++++++++ .../manager/state/TabletManagementIterator.java | 35 +- .../metadata/ConditionalTabletMutatorImpl.java | 23 + ...terator.java => CompactionsExistsIterator.java} | 20 +- .../metadata/iterators/LocationExistsIterator.java | 4 +- .../server/tablets/TabletNameGenerator.java | 97 ++++ .../server/tablets/UniqueNameAllocator.java | 11 - .../java/org/apache/accumulo/manager/Manager.java | 20 +- .../accumulo/manager/TabletGroupWatcher.java | 19 + .../manager/compaction/CompactionFinalizer.java | 229 --------- .../manager/compaction/QueueAndPriority.java | 90 ---- .../manager/compaction/QueueSummaries.java | 220 --------- .../{ => coordinator}/CompactionCoordinator.java | 359 +++++++++----- .../{ => coordinator}/DeadCompactionDetector.java | 13 +- .../queue/CompactionJobPriorityQueue.java | 189 ++++++++ .../compaction/queue/CompactionJobQueues.java | 114 +++++ .../accumulo/manager/tableOps/split/PreSplit.java | 4 +- .../compaction/CompactionCoordinatorTest.java | 517 +-------------------- .../manager/compaction/QueueSummariesTest.java | 194 -------- .../accumulo/tserver/tablet/CompactableImpl.java | 5 + .../accumulo/tserver/tablet/CompactableUtils.java | 12 - .../accumulo/tserver/tablet/DatafileManager.java | 3 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 55 +-- .../tserver/compaction/CompactableUtilsTest.java | 4 +- .../apache/accumulo/test/functional/BulkNewIT.java | 23 + 33 files changed, 1112 insertions(+), 1468 deletions(-) create mode 100644 server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionJobGenerator.java copy server/base/src/main/java/org/apache/accumulo/server/metadata/iterators/{TabletExistsIterator.java => CompactionsExistsIterator.java} (64%) create mode 100644 server/base/src/main/java/org/apache/accumulo/server/tablets/TabletNameGenerator.java delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/compaction/CompactionFinalizer.java delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/compaction/QueueAndPriority.java delete mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/compaction/QueueSummaries.java rename server/manager/src/main/java/org/apache/accumulo/manager/compaction/{ => coordinator}/CompactionCoordinator.java (66%) rename server/manager/src/main/java/org/apache/accumulo/manager/compaction/{ => coordinator}/DeadCompactionDetector.java (91%) create mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java create mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueues.java delete mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/compaction/QueueSummariesTest.java