This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 9c50447bc02f48684199bdec6b945a65e57d4edc Merge: e60390d580 12efe8adce Author: Dave Marion <[email protected]> AuthorDate: Tue Jun 27 18:03:46 2023 +0000 Merge branch 'main' into elasticity .../core/clientImpl/bulk/BulkSerialize.java | 3 +- .../apache/accumulo/core/lock/ServiceLockData.java | 10 +- .../accumulo/core/metadata/StoredTabletFile.java | 12 -- .../core/metadata/UnreferencedTabletFile.java | 1 + .../schema/ExternalCompactionFinalState.java | 9 +- .../schema/ExternalCompactionMetadata.java | 9 +- .../core/metadata/schema/RootTabletMetadata.java | 8 +- .../accumulo/core/metrics/MetricsProducer.java | 2 +- .../spi/compaction/DefaultCompactionPlanner.java | 5 +- .../spi/scan/ConfigurableScanServerSelector.java | 5 +- .../apache/accumulo/core/util/LazySingletons.java | 40 +++++ pom.xml | 4 + .../accumulo/server/conf/TableConfiguration.java | 14 -- .../server/conf/ZooBasedConfiguration.java | 10 +- .../accumulo/server/mem/LowMemoryDetector.java | 79 ++++----- .../accumulo/server/metadata/RootGcCandidates.java | 8 +- .../accumulo/manager/tableOps/TraceRepo.java | 6 +- .../util/logging/AccumuloMonitorAppender.java | 6 +- .../accumulo/test/CountNameNodeOpsBulkIT.java | 5 +- .../test/functional/MemoryFreeingIterator.java | 30 ++-- .../test/functional/MemoryStarvedMajCIT.java | 8 +- .../test/functional/MemoryStarvedMinCIT.java | 2 +- .../test/functional/MemoryStarvedScanIT.java | 192 ++++++++++++++++----- 23 files changed, 281 insertions(+), 187 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java index 88ada722af,421a707d75..907982f2ed --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionFinalState.java @@@ -26,13 -28,9 +28,10 @@@ import org.apache.accumulo.core.util.Te import org.apache.hadoop.io.Text; import com.google.common.base.Preconditions; - import com.google.gson.Gson; +// ELASTICITY_TODO remove this class, remove it from ample, add upgrade code to remove it from metadata table public class ExternalCompactionFinalState { - private static final Gson GSON = new Gson(); - public enum FinalState { FINISHED, FAILED }
