This is an automated email from the ASF dual-hosted git repository. cshannon pushed a change to branch grpc in repository https://gitbox.apache.org/repos/asf/accumulo.git
from d8185cdea7 Merge branch 'main' into elasticity add eb681a9da7 Fix String-to-bytes and bytes-to-String for UTF-8 Pt. 2 (#4791) add 003cdf333d Merge remote-tracking branch 'upstream/2.1' add 00cb09f957 Merge remote-tracking branch 'upstream/main' into elasticity add fd111a22a6 Ensure resources are closed in GarbageCollectWriteAheadLogs (#4790) add eda39bb1c1 Merge remote-tracking branch 'upstream/2.1' into main add f5396dfa85 Merge remote-tracking branch 'upstream/main' into elasticity add 07e781c80f Added runtime check for shared compaction queues (#4800) add b3120cd7df Configure test server classes before starting MAC (#4811) add f22e774ef6 Stop tracking last compactor check-in for non-existent groups (#4403) add d64bd908d4 adds a new count down timer (#4796) add 06af479f20 Merge branch 'main' into elasticity add 5dbc99ed69 Fix failing ITs due to recent features (#4813) add fa4b73f0f9 Merge Timer/CountdownTimer/NanoTime changes into elasticity (#4821) add 23a921726d Revert "Merge Timer/CountdownTimer/NanoTime changes into elasticity (#4821)" add 7deced8f5f Remove NanoTime object in favor of new Timer and CountdownTimer object (#4785) add 5908843e94 Remove Timer.startNewWithOffset() methods (#4818) add b6746488d9 Merge remote-tracking branch 'upstream/2.1' into main add 9e079dbbeb Bump Hadoop version from 3.3.6 to 3.4.0 (#4812) add aecd11f81c Merge branch 'main' into elasticity add 847487b164 Resolve todo in ServerContextTest for upgrade test (#4822) add 7d85cefb0d adds startedAfter method to Timer (#4824) No new revisions were added by this update. Summary of changes: .../core/clientImpl/ClientTabletCache.java | 11 +- .../core/clientImpl/ClientTabletCacheImpl.java | 36 ++-- .../accumulo/core/fate/AbstractFateStore.java | 18 +- .../java/org/apache/accumulo/core/fate/Fate.java | 10 +- .../org/apache/accumulo/core/lock/ServiceLock.java | 9 +- .../accumulo/core/metrics/MetricsProducer.java | 9 + .../apache/accumulo/core/util/CountDownTimer.java | 94 +++++++++ .../java/org/apache/accumulo/core/util/Timer.java | 33 +--- .../util/compaction/ExternalCompactionUtil.java | 7 +- .../apache/accumulo/core/util/time/NanoTime.java | 104 ---------- .../core/client/lexicoder/BytesLexicoderTest.java | 4 +- .../core/client/lexicoder/LexicoderTest.java | 5 +- .../core/clientImpl/ClientTabletCacheImplTest.java | 5 +- .../core/clientImpl/lexicoder/ByteUtilsTest.java | 15 +- .../accumulo/core/conf/ClientPropertyTest.java | 7 +- .../apache/accumulo/core/crypto/CryptoTest.java | 5 +- .../org/apache/accumulo/core/data/ColumnTest.java | 7 +- .../org/apache/accumulo/core/data/KeyTest.java | 38 ++-- .../apache/accumulo/core/data/MutationTest.java | 101 +++++----- .../org/apache/accumulo/core/data/RangeTest.java | 12 +- .../zookeeper/DistributedReadWriteLockTest.java | 3 +- .../core/file/rfile/CreateCompatTestFile.java | 5 +- .../core/file/rfile/GenerateSplitsTest.java | 3 +- .../accumulo/core/file/rfile/KeyShortenerTest.java | 11 +- .../core/file/rfile/MultiThreadedRFileTest.java | 4 +- .../apache/accumulo/core/file/rfile/RFileTest.java | 6 +- .../core/iterators/system/ColumnFilterTest.java | 5 +- .../iterators/system/VisibilityFilterTest.java | 4 +- .../accumulo/core/iterators/user/FilterTest.java | 23 +-- .../iterators/user/IndexedDocIteratorTest.java | 17 +- .../core/iterators/user/RegExFilterTest.java | 5 +- .../iterators/user/RowDeletingIteratorTest.java | 5 +- .../iterators/user/VersioningIteratorTest.java | 3 +- .../accumulo/core/security/AuthorizationsTest.java | 3 +- .../core/security/ColumnVisibilityTest.java | 8 +- .../balancer/HostRegexTableLoadBalancerTest.java | 8 +- .../accumulo/core/util/CountDownTimerTest.java | 97 +++++++++ .../org/apache/accumulo/core/util/TimerTest.java | 42 ++-- .../accumulo/core/util/time/NanoTimeTest.java | 162 --------------- .../hadoop/its/mapred/AccumuloInputFormatIT.java | 5 +- .../hadoop/its/mapred/AccumuloOutputFormatIT.java | 9 +- .../its/mapred/AccumuloRowInputFormatIT.java | 11 +- .../hadoop/its/mapred/MultiTableInputFormatIT.java | 5 +- .../accumulo/hadoop/its/mapred/TokenFileIT.java | 9 +- .../its/mapreduce/AccumuloInputFormatIT.java | 5 +- .../its/mapreduce/AccumuloOutputFormatIT.java | 9 +- .../its/mapreduce/AccumuloRowInputFormatIT.java | 11 +- .../its/mapreduce/MultiTableInputFormatIT.java | 5 +- .../accumulo/hadoop/its/mapreduce/RowHashIT.java | 5 +- .../accumulo/hadoop/its/mapreduce/TokenFileIT.java | 9 +- .../miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +- pom.xml | 2 +- .../accumulo/server/compaction/FileCompactor.java | 14 +- .../server/conf/CheckCompactionConfig.java | 28 ++- .../apache/accumulo/server/ServerContextTest.java | 3 +- .../server/conf/CheckCompactionConfigTest.java | 37 +++- .../accumulo/server/data/ServerMutationTest.java | 21 +- .../security/handler/ZKAuthenticatorTest.java | 2 +- .../org/apache/accumulo/compactor/Compactor.java | 6 +- .../accumulo/gc/GarbageCollectWriteAheadLogs.java | 28 ++- .../apache/accumulo/gc/SimpleGarbageCollector.java | 9 +- .../gc/GarbageCollectWriteAheadLogsTest.java | 51 ++--- .../java/org/apache/accumulo/manager/Manager.java | 6 +- .../accumulo/manager/TabletGroupWatcher.java | 14 +- .../coordinator/CompactionCoordinator.java | 220 +++++++++++++++------ .../coordinator/DeadCompactionDetector.java | 3 +- .../accumulo/manager/metrics/ManagerMetrics.java | 12 ++ .../availability/SetTabletAvailability.java | 8 +- .../manager/tableOps/merge/ReserveTablets.java | 7 +- .../manager/upgrade/UpgradeCoordinator.java | 2 +- .../compaction/CompactionCoordinatorTest.java | 16 +- .../org/apache/accumulo/monitor/it/WebViewsIT.java | 3 +- .../org/apache/accumulo/tserver/ScanServer.java | 6 +- .../accumulo/tserver/UnloadTabletHandler.java | 6 +- .../accumulo/tserver/CheckTabletMetadataTest.java | 5 +- .../accumulo/tserver/TservConstraintEnvTest.java | 3 +- .../shell/commands/HistoryCommandTest.java | 4 +- .../apache/accumulo/test/ConditionalWriterIT.java | 8 +- .../org/apache/accumulo/test/InMemoryMapIT.java | 3 +- .../apache/accumulo/test/MultiTableRecoveryIT.java | 3 +- .../apache/accumulo/test/ScanServerShutdownIT.java | 13 +- .../org/apache/accumulo/test/VerifyIngest.java | 6 +- .../compaction/BadCompactionServiceConfigIT.java | 146 ++++++++++++-- .../test/compaction/CompactionExecutorIT.java | 30 ++- .../test/compaction/ExternalCompaction2BaseIT.java | 4 +- .../test/compaction/ExternalCompaction_2_IT.java | 4 - .../compaction/FlakyExternalCompaction2IT.java | 20 +- .../accumulo/test/functional/AuthsIterator.java | 4 +- .../accumulo/test/functional/CombinerIT.java | 3 +- .../accumulo/test/functional/CompactionIT.java | 2 +- .../accumulo/test/functional/KerberosIT.java | 3 +- .../test/functional/MemoryStarvedMajCIT.java | 23 +-- .../test/functional/WatchTheWatchCountIT.java | 5 +- .../accumulo/test/metrics/TestStatsDSink.java | 4 +- 94 files changed, 1022 insertions(+), 804 deletions(-) create mode 100644 core/src/main/java/org/apache/accumulo/core/util/CountDownTimer.java delete mode 100644 core/src/main/java/org/apache/accumulo/core/util/time/NanoTime.java create mode 100644 core/src/test/java/org/apache/accumulo/core/util/CountDownTimerTest.java delete mode 100644 core/src/test/java/org/apache/accumulo/core/util/time/NanoTimeTest.java