This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from f0e4f8fd06 Merge branch '2.1' add b2c5fc4800 Introduce Compactor configuration for dealing with consecutive failures (#5726) new 6869eb3d9c Merge branch '2.1' The 1 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: .../accumulo/core/classloader/ClassLoaderUtil.java | 13 +- .../core/client/ClientSideIteratorScanner.java | 4 +- .../accumulo/core/client/rfile/RFileScanner.java | 4 +- .../accumulo/core/clientImpl/ClientContext.java | 4 + .../accumulo/core/clientImpl/OfflineIterator.java | 14 +- .../org/apache/accumulo/core/conf/Property.java | 29 +++ .../core/iteratorsImpl/IteratorConfigUtil.java | 9 +- .../iteratorsImpl/conf/ColumnToClassMapping.java | 5 +- .../org/apache/accumulo/core/metrics/Metric.java | 14 ++ .../core/spi/common/ContextClassLoaderFactory.java | 29 ++- .../accumulo/core/summary/SummarizerFactory.java | 8 +- .../thrift/CompactionCoordinatorService.java | 137 +++++++++-- core/src/main/thrift/compaction-coordinator.thrift | 1 + .../classloader/ContextClassLoaderFactoryTest.java | 3 +- .../core/iteratorsImpl/IteratorConfigUtilTest.java | 13 +- pom.xml | 2 +- .../org/apache/accumulo/server/AbstractServer.java | 6 +- .../org/apache/accumulo/server/ServerContext.java | 3 + .../accumulo/server/compaction/FileCompactor.java | 8 +- .../server/metadata/RootConditionalWriter.java | 2 +- .../server/tablets/ConditionCheckerContext.java | 7 +- .../org/apache/accumulo/compactor/Compactor.java | 157 +++++++++++- .../apache/accumulo/gc/SimpleGarbageCollector.java | 1 + .../java/org/apache/accumulo/manager/Manager.java | 1 + .../coordinator/CompactionCoordinator.java | 108 ++++++++- .../compaction/CompactionCoordinatorTest.java | 5 +- .../accumulo/monitor/resources/js/compactions.js | 2 +- .../org/apache/accumulo/tserver/ScanServer.java | 1 + .../accumulo/tserver/TabletClientHandler.java | 4 +- .../org/apache/accumulo/tserver/TabletServer.java | 2 +- .../accumulo/tserver/tablet/MinorCompactor.java | 2 +- .../accumulo/tserver/tablet/ScanDataSource.java | 9 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +- .../main/java/org/apache/accumulo/shell/Shell.java | 4 +- .../accumulo/shell/commands/SetIterCommand.java | 3 +- .../shell/commands/SetShellIterCommand.java | 3 +- .../compaction/ClassLoaderContextCompactionIT.java | 268 +++++++++++++++++++++ .../apache/accumulo/test/metrics/MetricsIT.java | 10 +- .../test/performance/scan/CollectTabletStats.java | 2 +- 39 files changed, 815 insertions(+), 86 deletions(-) create mode 100644 test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java