This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch temp
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 052861af5a3c8ac81cdbf08a142f70515fd0592d
Merge: bdbbe87030 a3cab15546
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Mar 3 14:37:56 2023 -0500
Merge branch 'main' into move_service_lock
assemble/bin/accumulo-cluster | 26 +-
assemble/pom.xml | 5 -
contrib/ci/find-unapproved-junit.sh | 1 -
core/pom.xml | 29 +-
.../accumulo/core/classloader/ClassLoaderUtil.java | 9 +-
.../DefaultContextClassLoaderFactory.java | 102 -----
.../classloader/URLContextClassLoaderFactory.java | 75 ++++
.../core/client/admin/ActiveCompaction.java | 6 +
.../core/clientImpl/ActiveCompactionImpl.java | 5 +
.../accumulo/core/clientImpl/bulk/BulkImport.java | 6 +-
.../org/apache/accumulo/core/conf/Property.java | 92 ++---
.../apache/accumulo/core/conf/PropertyType.java | 5 +-
.../core/conf/cluster/ClusterConfigParser.java | 18 +-
.../org/apache/accumulo/core/data/InstanceId.java | 14 +-
.../org/apache/accumulo/core/data/NamespaceId.java | 15 +-
.../org/apache/accumulo/core/data/TableId.java | 15 +-
.../apache/accumulo/core/file/FileOperations.java | 2 +-
.../cache/impl/BlockCacheManagerFactory.java | 2 +-
.../file/blockfile/impl/CachableBlockFile.java | 13 +-
.../file/rfile/bcfile/CompressionAlgorithm.java | 20 +-
.../apache/accumulo/core/iterators/Combiner.java | 29 +-
.../core/iterators/IteratorEnvironment.java | 10 +
.../core/iterators/SortedKeyValueIterator.java | 13 +
.../accumulo/core/iterators/WrappingIterator.java | 11 +-
.../accumulo/core/metrics/MetricsProducer.java | 32 ++
.../spi/balancer/HostRegexTableLoadBalancer.java | 16 +-
.../core/spi/common/ContextClassLoaderFactory.java | 16 +-
.../spi/compaction/DefaultCompactionPlanner.java | 4 +-
.../core/spi/fs/SpaceAwareVolumeChooser.java | 21 +-
.../org/apache/accumulo/core/summary/Gatherer.java | 2 +-
.../accumulo/core/summary/SummaryReader.java | 2 +-
.../compaction/CompactionPlannerInitParams.java | 4 +-
.../accumulo/core/util/tables/TableZooHelper.java | 13 +-
.../core/tabletserver/thrift/ActiveCompaction.java | 104 ++++-
core/src/main/thrift/tabletserver.thrift | 1 +
.../classloader/ContextClassLoaderFactoryTest.java | 2 +-
.../core/classloader/URLClassLoaderFactory.java | 46 ---
.../core/conf/AccumuloConfigurationTest.java | 21 +-
.../core/conf/cluster/ClusterConfigParserTest.java | 68 ++-
.../accumulo/core/fate/zookeeper/ZooUtilTest.java | 22 +-
.../accumulo/core/iterators/CombinerTestUtil.java | 2 +-
.../core/spi/fs/SpaceAwareVolumeChooserTest.java | 4 +-
core/src/test/resources/log4j2-test.properties | 4 -
hadoop-mapreduce/pom.xml | 6 -
.../src/test/resources/log4j2-test.properties | 4 -
iterator-test-harness/pom.xml | 6 -
minicluster/pom.xml | 4 -
.../miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +-
.../miniclusterImpl/MiniAccumuloConfigImpl.java | 6 -
.../MiniAccumuloClusterClasspathTest.java | 12 +-
pom.xml | 79 ++--
server/base/pom.xml | 6 -
.../org/apache/accumulo/server/AbstractServer.java | 9 +
.../org/apache/accumulo/server/ServerContext.java | 7 +
.../accumulo/server/compaction/CompactionInfo.java | 8 +-
.../server/compaction/CompactionStats.java | 13 +-
.../accumulo/server/compaction/FileCompactor.java | 45 +-
...tionStats.java => PausedCompactionMetrics.java} | 47 +--
.../org/apache/accumulo/server/fs/FileManager.java | 2 +-
.../iterators/SystemIteratorEnvironment.java | 5 +
.../LowMemoryDetector.java} | 83 +++-
.../server/conf/CheckCompactionConfigTest.java | 51 +++
server/compaction-coordinator/pom.xml | 6 -
.../coordinator/CompactionCoordinator.java | 11 -
.../coordinator/CompactionCoordinatorTest.java | 3 -
server/compactor/pom.xml | 6 -
.../org/apache/accumulo/compactor/Compactor.java | 30 +-
.../apache/accumulo/compactor/CompactorTest.java | 8 +-
server/gc/pom.xml | 6 -
server/manager/pom.xml | 10 +-
.../accumulo/manager/recovery/RecoveryManager.java | 18 +-
server/monitor/pom.xml | 11 +-
server/native/pom.xml | 6 -
server/tserver/pom.xml | 19 +-
.../org/apache/accumulo/tserver/ScanServer.java | 18 +-
.../accumulo/tserver/TabletClientHandler.java | 6 +-
.../accumulo/tserver/TabletHostingServer.java | 6 +-
.../org/apache/accumulo/tserver/TabletServer.java | 29 +-
.../tserver/TabletServerResourceManager.java | 6 +-
.../tserver/compactions/CompactionManager.java | 1 +
.../tserver/metrics/TabletServerScanMetrics.java | 16 +
.../accumulo/tserver/tablet/CompactableUtils.java | 2 +-
.../accumulo/tserver/tablet/MinorCompactor.java | 4 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 5 +
.../apache/accumulo/tserver/tablet/TabletBase.java | 60 ++-
.../src/test/resources/log4j2-test.properties | 4 -
shell/pom.xml | 6 -
.../accumulo/shell/commands/ClasspathCommand.java | 20 +-
shell/src/test/resources/log4j2-test.properties | 4 -
start/pom.xml | 40 +-
.../main/java/org/apache/accumulo/start/Main.java | 47 +--
.../start/classloader/AccumuloClassLoader.java | 224 ----------
.../vfs/AccumuloReloadingVFSClassLoader.java | 330 ---------------
.../classloader/vfs/AccumuloVFSClassLoader.java | 458 ---------------------
.../start/classloader/vfs/ContextManager.java | 233 -----------
.../vfs/PostDelegatingVFSClassLoader.java | 50 ---
.../classloader/vfs/ReloadingClassLoader.java | 24 --
.../classloader/vfs/UniqueFileReplicator.java | 112 -----
.../{classloader/vfs => util}/MiniDFSUtil.java | 2 +-
.../classloader/vfs/AccumuloClasspathTest.java | 58 ---
.../vfs/AccumuloReloadingVFSClassLoaderTest.java | 188 ---------
.../vfs/AccumuloVFSClassLoaderTest.java | 209 ----------
.../start/classloader/vfs/ContextManagerTest.java | 151 -------
.../start/classloader/vfs/WithTestNames.java | 42 --
.../vfs/providers/VfsClassLoaderTest.java | 151 -------
.../accumulo/start/test/AccumuloDFSBase.java | 138 -------
start/src/test/resources/log4j2-test.properties | 4 -
test/pom.xml | 4 -
.../accumulo/test/functional/ClassLoaderIT.java | 121 ------
.../test/functional/MemoryConsumingIterator.java | 91 ++++
.../test/functional/MemoryFreeingIterator.java | 23 +-
.../test/functional/MemoryStarvedMajCIT.java | 167 ++++++++
.../test/functional/MemoryStarvedMinCIT.java | 168 ++++++++
.../test/functional/MemoryStarvedScanIT.java | 388 +++++++++++++++++
.../accumulo/test/functional/ScannerContextIT.java | 24 +-
.../apache/accumulo/test/metrics/MetricsIT.java | 3 +-
.../apache/accumulo/test/shell/ShellServerIT.java | 48 +--
test/src/main/resources/log4j2-test.properties | 4 -
118 files changed, 1767 insertions(+), 3358 deletions(-)
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletHostingServer.java
index 5fccbab280,bbff2e1377..8e5047bb40
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletHostingServer.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletHostingServer.java
@@@ -20,12 -20,12 +20,12 @@@ package org.apache.accumulo.tserver
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
import org.apache.accumulo.core.fate.zookeeper.ZooCache;
+import org.apache.accumulo.core.lock.ServiceLock;
import org.apache.accumulo.core.spi.cache.BlockCacheManager;
import org.apache.accumulo.core.spi.scan.ScanServerInfo;
- import org.apache.accumulo.server.GarbageCollectionLogger;
import org.apache.accumulo.server.ServerContext;
+ import org.apache.accumulo.server.compaction.PausedCompactionMetrics;
import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.tserver.metrics.TabletServerScanMetrics;
import org.apache.accumulo.tserver.session.Session;
