This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 3e85f58ab9 Do not fall back to tablet servers when no scan servers by default (#4814) add 053acd43ce adds metric to count zombie scans (#4840) add f97055f6c9 cleanup scan session when batch scanner closed (#4841) add dcbc5d606a Stops waiting on scans during tablet close. (#4819) new 88c2f7bbb6 Merge branch '2.1' into 3.1 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: .../TabletServerBatchReaderIterator.java | 20 +- .../accumulo/core/metrics/MetricsProducer.java | 8 + .../org/apache/accumulo/tserver/ScanServer.java | 1 + .../org/apache/accumulo/tserver/TabletServer.java | 1 + .../accumulo/tserver/ThriftScanClientHandler.java | 10 +- .../tserver/metrics/TabletServerScanMetrics.java | 13 +- .../apache/accumulo/tserver/scan/LookupTask.java | 2 +- .../accumulo/tserver/scan/NextBatchTask.java | 2 +- .../accumulo/tserver/scan/ScanParameters.java | 10 + .../org/apache/accumulo/tserver/scan/ScanTask.java | 93 ++++- .../accumulo/tserver/session/ScanSession.java | 69 +++- .../apache/accumulo/tserver/session/Session.java | 14 +- .../accumulo/tserver/session/SessionManager.java | 67 +++- .../accumulo/tserver/tablet/ScanDataSource.java | 4 + .../org/apache/accumulo/tserver/tablet/Tablet.java | 39 ++- .../tserver/session/SessionManagerTest.java | 42 +++ .../org/apache/accumulo/test/ZombieScanIT.java | 387 +++++++++++++++++++++ .../test/functional/ScanSessionTimeOutIT.java | 19 +- .../apache/accumulo/test/functional/ScannerIT.java | 81 +++++ 19 files changed, 855 insertions(+), 27 deletions(-) create mode 100644 test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java