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 f674e9a0b0 Moves the compaction commit process into FATE (#4109) add ff93f66712 Validate recovered lock type (#4125) add f2c779ea56 Warn when tablet needs compacting and is not (#4143) add 7de3e0aa36 Switch from Guava to Caffeine (#4147) add f26c702a87 Clean up usage of TabletsMetadata (#3980) new 1f218de444 Merge remote-tracking branch 'upstream/main' into elasticity 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: .../core/clientImpl/TableOperationsImpl.java | 71 +++++++++--------- .../clientImpl/bulk/ConcurrentKeyExtentCache.java | 17 ++--- .../fate/zookeeper/DistributedReadWriteLock.java | 33 +++++---- .../org/apache/accumulo/core/summary/Gatherer.java | 22 +++--- .../java/org/apache/accumulo/core/util/Merge.java | 62 ++++++++-------- .../org/apache/accumulo/core/util/MergeTest.java | 31 +++++++- .../manager/balancer/BalancerEnvironmentImpl.java | 12 ++-- .../accumulo/server/metadata/ServerAmpleImpl.java | 2 +- .../main/java/org/apache/accumulo/gc/GCRun.java | 4 +- .../accumulo/gc/GarbageCollectionAlgorithm.java | 84 +++++++++++----------- .../apache/accumulo/manager/tableOps/Utils.java | 15 +++- .../manager/tableOps/bulkVer2/LoadFiles.java | 23 +++--- .../manager/tableOps/bulkVer2/PrepBulkImport.java | 42 ++++++++--- .../tableOps/bulkVer2/PrepBulkImportTest.java | 31 +++++--- .../org/apache/accumulo/tserver/ScanServer.java | 10 ++- .../java/org/apache/accumulo/test/AmpleIT.java | 16 +++-- .../java/org/apache/accumulo/test/GCRunIT.java | 13 ++-- .../accumulo/test/ScanServerMetadataEntriesIT.java | 6 +- .../test/compaction/ExternalCompaction4_IT.java | 33 +++++---- .../test/compaction/ExternalCompaction_2_IT.java | 8 +-- .../test/functional/GarbageCollectorTrashBase.java | 17 ++--- .../accumulo/test/functional/MetadataIT.java | 15 ++-- 22 files changed, 335 insertions(+), 232 deletions(-)