This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from e76085787d Merge branch 'main' into no-chop-merge
add 801db455a5 Remove unneeded handling of exceptions not thrown (#3556)
add 0252a64b6b Merge branch '2.1'
add 4b1c1b17eb Validate file metadata in MetadataConstraints (#3506)
add 19c81d8249 User compaction not retried after failure (#3555)
add a8cc689a77 Change Wait.waitFor to throw IllegalStateException (#3568)
add 4e3f891298 Merge remote-tracking branch 'upstream/2.1'
add ffe0018b51 fix Wait.waitFor usage errors after merge update
add 8449663655 Merge branch 'main' into no-chop-merge
add de02f025ce ensures sessions are always cleaned up (#3569)
add 767d28d99a avoids calling toString on Text for isEmpty (#3572)
add 20cecbe8b9 logs info when a tablet consistency check goes from bad to
good (#3574)
add 9bbf42f4dc Fix TabletGroupWatcher shutdown order (#3571)
add d4846d407e Merge branch '2.1'
add 5282088890 adds unit test for deferred session cleanup (#3581)
add 0733d3ae86 adds logging when tablet close is waiting on a scan (#3582)
add 0a3feba20f Merge branch '2.1'
new ed0b621698 Merge branch 'main' into no-chop-merge
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/metadata/StoredTabletFile.java | 7 +
.../hadoopImpl/mapred/AccumuloRecordWriter.java | 2 +-
.../hadoopImpl/mapreduce/AccumuloRecordWriter.java | 2 +-
.../server/constraints/MetadataConstraints.java | 25 ++-
.../manager/state/LoggingTabletStateStore.java | 6 +
.../server/manager/state/MetaDataStateStore.java | 15 +-
.../server/manager/state/RootTabletStateStore.java | 5 +-
.../server/manager/state/TabletStateStore.java | 11 +-
.../server/manager/state/ZooTabletStateStore.java | 10 +-
.../constraints/MetadataConstraintsTest.java | 127 +++++++++++++---
.../manager/state/RootTabletStateStoreTest.java | 3 +-
.../accumulo/manager/TabletGroupWatcher.java | 49 +++++-
.../apache/accumulo/manager/state/TableCounts.java | 9 ++
.../apache/accumulo/manager/state/TableStats.java | 6 +
.../manager/tserverOps/ShutdownTServer.java | 3 +
.../org/apache/accumulo/tserver/TabletServer.java | 1 +
.../accumulo/tserver/UnloadTabletHandler.java | 1 +
.../compactions/InternalCompactionExecutor.java | 12 +-
.../metrics/CompactionExecutorsMetrics.java | 34 +++--
.../accumulo/tserver/session/ScanSession.java | 4 +
.../apache/accumulo/tserver/session/Session.java | 6 +
.../accumulo/tserver/session/SessionManager.java | 87 +++++++----
.../accumulo/tserver/tablet/CompactableImpl.java | 14 +-
.../accumulo/tserver/tablet/ScanDataSource.java | 11 ++
.../org/apache/accumulo/tserver/tablet/Tablet.java | 25 ++-
.../tserver/session/SessionManagerTest.java | 109 ++++++++++++++
.../tablet/CompactableImplFileManagerTest.java | 2 +-
.../org/apache/accumulo/test/LargeSplitRowIT.java | 2 +-
.../java/org/apache/accumulo/test/TestIngest.java | 10 ++
.../test/compaction/ExternalCompaction4_IT.java | 135 +++++++++++++++++
.../accumulo/test/conf/PropStoreConfigIT.java | 48 +++---
.../accumulo/test/conf/util/ZooPropEditorIT.java | 37 +++--
.../accumulo/test/functional/CompactionIT.java | 78 ++++++++++
...lowIterator.java => ErrorThrowingIterator.java} | 89 ++++++-----
.../test/functional/KerberosRenewalIT.java | 3 +-
.../test/functional/ManagerAssignmentIT.java | 167 +++++++++++++++++++++
.../test/functional/MemoryStarvedMajCIT.java | 2 +-
.../test/functional/MemoryStarvedScanIT.java | 12 +-
.../accumulo/test/functional/ReadWriteIT.java | 6 +
.../apache/accumulo/test/shell/ShellServerIT.java | 8 +-
.../java/org/apache/accumulo/test/util/Wait.java | 69 +++++++--
test/src/main/resources/log4j2-test.properties | 3 +
42 files changed, 1044 insertions(+), 211 deletions(-)
create mode 100644
server/tserver/src/test/java/org/apache/accumulo/tserver/session/SessionManagerTest.java
create mode 100644
test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
copy test/src/main/java/org/apache/accumulo/test/functional/{SlowIterator.java
=> ErrorThrowingIterator.java} (52%)
