This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch no-chop-merge in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ed0b621698482df19666089e33052881dff6c43f Merge: 8449663655 0a3feba20f Author: Christopher L. Shannon (cshannon) <[email protected]> AuthorDate: Thu Jul 13 19:22:37 2023 -0400 Merge branch 'main' into no-chop-merge .../hadoopImpl/mapred/AccumuloRecordWriter.java | 2 +- .../hadoopImpl/mapreduce/AccumuloRecordWriter.java | 2 +- .../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 +- .../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 + .../accumulo/tserver/session/ScanSession.java | 4 + .../apache/accumulo/tserver/session/Session.java | 6 + .../accumulo/tserver/session/SessionManager.java | 87 +++++++---- .../accumulo/tserver/tablet/ScanDataSource.java | 11 ++ .../org/apache/accumulo/tserver/tablet/Tablet.java | 25 ++- .../tserver/session/SessionManagerTest.java | 109 ++++++++++++++ .../test/functional/ManagerAssignmentIT.java | 167 +++++++++++++++++++++ test/src/main/resources/log4j2-test.properties | 3 + 22 files changed, 486 insertions(+), 49 deletions(-)
