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 e7d789dc79 Small improvements to AccumuloStore related code (#4121)
add bd8a67fa4e ZooStore deferral time to use System.nanoTime() (#4126)
add 7921425c04 Merge remote-tracking branch 'upstream/2.1'
add 0612a2d675 Add resource to try-with-resources block in ZooStore (#4128)
add d443a9729e Merge remote-tracking branch 'upstream/2.1'
add d02340a7ee Added Indication of Intermediate Compactions to
CompactionConfigurer (#4118)
add 5583129435 Return non-merged view of System config (#4120)
add 08628c016b Updates DefaultCompactionPlanner to honor table.file.max
prop (#4127)
add 6dc1bcfa55 Merge branch '2.1'
new 6f908863f5 Merge branch 'main' into elasticity
new 0d55086316 removes code added for debugging merge
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/client/admin/InstanceOperations.java | 10 ++
.../admin/compaction/CompactionConfigurer.java | 23 +++
.../core/clientImpl/InstanceOperationsImpl.java | 7 +
.../org/apache/accumulo/core/conf/Property.java | 8 +-
.../accumulo/core/fate/AbstractFateStore.java | 14 +-
.../org/apache/accumulo/core/fate/AdminUtil.java | 5 +-
.../org/apache/accumulo/core/fate/AgeOffStore.java | 5 +-
.../java/org/apache/accumulo/core/fate/Fate.java | 13 +-
.../org/apache/accumulo/core/fate/FateStore.java | 3 +-
.../accumulo/core/fate/WrappedFateTxStore.java | 5 +-
.../core/file/rfile/bcfile/PrintBCInfo.java | 14 +-
.../spi/compaction/DefaultCompactionPlanner.java | 117 +++++++++++-
.../ShellCompactCommandConfigurerTest.java | 5 +
.../apache/accumulo/core/fate/AgeOffStoreTest.java | 17 +-
.../org/apache/accumulo/core/fate/TestStore.java | 3 +-
.../compaction/DefaultCompactionPlannerTest.java | 200 ++++++++++++++++++++-
.../server/compaction/CompactionPluginUtils.java | 16 +-
.../coordinator/CompactionCoordinator.java | 13 +-
.../accumulo/test/conf/PropStoreConfigIT.java | 41 +++++
.../accumulo/test/functional/CompactionIT.java | 192 ++++++++++++++++++++
20 files changed, 664 insertions(+), 47 deletions(-)
