You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2026/05/13 23:56:32 UTC
(hbase-site) branch asf-site updated: Published site at b3a982fda7f284d9b7e8059205f84be4f2a397e2.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/hbase-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 4bdf3b06d6c Published site at b3a982fda7f284d9b7e8059205f84be4f2a397e2.
4bdf3b06d6c is described below
commit 4bdf3b06d6c55f9804dbfc00b3969e493d8e2e32
Author: HBase <de...@hbase.apache.org>
AuthorDate: Wed May 13 23:52:29 2026 +0000
Published site at b3a982fda7f284d9b7e8059205f84be4f2a397e2.
---
books/apache-hbase-reference-guide-dark-mode.pdf | Bin 38899979 -> 38899979 bytes
books/apache-hbase-reference-guide.pdf | Bin 38790049 -> 38790050 bytes
checkstyle-aggregate.html | 44 +-
dependency-convergence.html | 2 +-
dependency-info.html | 2 +-
dependency-management.html | 2 +-
hbase-website/dependency-convergence.html | 2 +-
hbase-website/dependency-info.html | 2 +-
hbase-website/dependency-management.html | 2 +-
hbase-website/index.html | 2 +-
hbase-website/issue-management.html | 2 +-
hbase-website/licenses.html | 2 +-
hbase-website/mailing-lists.html | 2 +-
hbase-website/plugin-management.html | 2 +-
hbase-website/plugins.html | 2 +-
hbase-website/project-info.html | 2 +-
hbase-website/scm.html | 2 +-
hbase-website/summary.html | 2 +-
hbase-website/team.html | 2 +-
issue-management.html | 2 +-
licenses.html | 2 +-
mailing-lists.html | 2 +-
plugin-management.html | 2 +-
plugins.html | 2 +-
project-info.html | 2 +-
project-reports.html | 2 +-
scm.html | 2 +-
summary.html | 2 +-
team.html | 2 +-
testapidocs/index-all.html | 168 +-
testapidocs/member-search-index.js | 2 +-
.../hadoop/hbase/class-use/HBaseClassTestRule.html | 114 -
.../class-use/HBaseParameterizedTestTemplate.html | 33 +-
.../hadoop/hbase/class-use/TableNameTestRule.html | 3 -
.../regionserver/TestSCVFWithMiniCluster.html | 431 ++--
.../hbase/regionserver/TestScanWithBloomError.html | 323 ++-
.../hadoop/hbase/regionserver/TestScanner.html | 1048 +++++----
.../regionserver/TestScannerBlockSizeLimits.html | 530 +++--
...tScannerHeartbeatMessages.SparseCellFilter.html | 1218 ++++++-----
...stScannerHeartbeatMessages.SparseRowFilter.html | 1218 ++++++-----
.../regionserver/TestScannerHeartbeatMessages.html | 1218 ++++++-----
...rLeaseCount.MockedQuotaManagerRegionServer.html | 369 ++--
.../hbase/regionserver/TestScannerLeaseCount.html | 369 ++--
.../regionserver/TestScannerRPCScanMetrics.html | 253 ++-
...nnerRetriableFailure.FaultyScannerObserver.html | 283 ++-
.../regionserver/TestScannerRetriableFailure.html | 283 ++-
.../regionserver/TestScannerTimeoutHandling.html | 349 ++-
.../regionserver/TestScannerWithBulkload.html | 116 +-
...erWithCorruptHFile.CorruptHFileCoprocessor.html | 203 +-
.../regionserver/TestScannerWithCorruptHFile.html | 203 +-
.../regionserver/TestSecureBulkLoadManager.html | 468 ++--
.../regionserver/TestSecureBulkloadListener.html | 463 ++--
.../hbase/regionserver/TestSeekOptimizations.html | 802 ++++---
.../hbase/regionserver/TestServerNonceManager.html | 567 +++--
...ingTimeoutOnBlockingPoint.SleepCoprocessor.html | 220 +-
.../TestSettingTimeoutOnBlockingPoint.html | 220 +-
.../TestShutdownWhileWALBroken.MyRegionServer.html | 268 ++-
.../regionserver/TestShutdownWhileWALBroken.html | 268 ++-
.../regionserver/TestSimpleTimeRangeTracker.html | 236 +--
.../hbase/regionserver/TestSplitLogWorker.html | 757 ++++---
...actionOnCluster.FailingSplitMasterObserver.html | 2232 ++++++++++----------
.../TestSplitTransactionOnCluster.MyMaster.html | 2232 ++++++++++----------
.../TestSplitTransactionOnCluster.html | 2232 ++++++++++----------
.../hbase/regionserver/TestSplitWalDataLoss.html | 252 ++-
.../regionserver/TestSplitWithBlockingFiles.html | 239 +--
.../hbase/regionserver/TestStoreFileInfo.html | 211 +-
...ileRefresherChore.FailingHRegionFileSystem.html | 491 +++--
.../regionserver/TestStoreFileRefresherChore.html | 491 +++--
.../hbase/regionserver/TestStoreFileScanner.html | 202 +-
.../TestStoreFileScannerWithTagCompression.html | 196 +-
.../hbase/regionserver/TestStoreFileWriter.html | 517 +++--
.../hbase/regionserver/TestStoreScanner.html | 507 +++--
.../regionserver/TestStoreScannerClosure.html | 553 +++--
.../TestStripeStoreEngine.TestStoreEngine.html | 189 +-
.../hbase/regionserver/TestStripeStoreEngine.html | 189 +-
.../regionserver/TestStripeStoreFileManager.html | 1169 +++++-----
...ToStreamRead.MatchLastRowCellNextColFilter.html | 605 +++---
...ToStreamRead.MatchLastRowCellNextRowFilter.html | 605 +++---
...chToStreamRead.MatchLastRowFilterRowFilter.html | 605 +++---
...stSwitchToStreamRead.MatchLastRowKeyFilter.html | 605 +++---
.../hbase/regionserver/TestSwitchToStreamRead.html | 605 +++---
.../regionserver/TestSyncTimeRangeTracker.html | 301 ++-
.../TestTableDescriptorHashComputation.html | 191 +-
.../TestTags.TestCoprocessorForTags.html | 6 +-
.../apache/hadoop/hbase/regionserver/TestTags.html | 6 +-
.../hbase/regionserver/TestTagsReverseScan.html | 4 +-
.../regionserver/TestTimestampFilterSeekHint.html | 163 +-
...tWALMonotonicallyIncreasingSeqId.IncThread.html | 439 ++--
...tWALMonotonicallyIncreasingSeqId.PutThread.html | 439 ++--
.../TestWALMonotonicallyIncreasingSeqId.html | 439 ++--
.../TestWalAndCompactingMemStoreFlush.html | 1969 +++++++++--------
.../hadoop/hbase/regionserver/TestWideScanner.html | 278 ++-
.../org/apache/hadoop/hbase/wal/TestSecureWAL.html | 24 +-
testdevapidocs/index-all.html | 188 +-
testdevapidocs/member-search-index.js | 2 +-
.../hadoop/hbase/class-use/HBaseClassTestRule.html | 114 -
.../class-use/HBaseParameterizedTestTemplate.html | 33 +-
.../hadoop/hbase/class-use/TableNameTestRule.html | 3 -
.../regionserver/TestSCVFWithMiniCluster.html | 85 +-
.../hbase/regionserver/TestScanWithBloomError.html | 102 +-
.../hadoop/hbase/regionserver/TestScanner.html | 116 +-
.../regionserver/TestScannerBlockSizeLimits.html | 92 +-
...tScannerHeartbeatMessages.HeartbeatHRegion.html | 22 +-
...erHeartbeatMessages.HeartbeatHRegionServer.html | 6 +-
...stScannerHeartbeatMessages.HeartbeatKVHeap.html | 8 +-
...nnerHeartbeatMessages.HeartbeatRPCServices.html | 8 +-
...erHeartbeatMessages.HeartbeatRegionScanner.html | 8 +-
...rHeartbeatMessages.HeartbeatReversedKVHeap.html | 6 +-
...eatMessages.HeartbeatReversedRegionScanner.html | 8 +-
...tScannerHeartbeatMessages.SparseCellFilter.html | 8 +-
...stScannerHeartbeatMessages.SparseRowFilter.html | 8 +-
.../regionserver/TestScannerHeartbeatMessages.html | 159 +-
...rLeaseCount.MockedQuotaManagerRegionServer.html | 10 +-
...estScannerLeaseCount.MockedRpcQuotaManager.html | 14 +-
...eCount.ScannerTrackingRSRpcServicesForTest.html | 6 +-
.../hbase/regionserver/TestScannerLeaseCount.html | 97 +-
...PCScanMetrics.RSRPCServicesWithScanMetrics.html | 8 +-
...RPCScanMetrics.RegionServerWithScanMetrics.html | 6 +-
.../regionserver/TestScannerRPCScanMetrics.html | 58 +-
...nnerRetriableFailure.FaultyScannerObserver.html | 10 +-
.../regionserver/TestScannerRetriableFailure.html | 66 +-
...meoutHandling.RSRpcServicesWithScanTimeout.html | 12 +-
...imeoutHandling.RegionServerWithScanTimeout.html | 6 +-
.../regionserver/TestScannerTimeoutHandling.html | 56 +-
.../regionserver/TestScannerWithBulkload.html | 77 +-
...erWithCorruptHFile.CorruptHFileCoprocessor.html | 8 +-
.../regionserver/TestScannerWithCorruptHFile.html | 48 +-
...ureBulkLoadManager.MyExceptionToAvoidRetry.html | 6 +-
.../regionserver/TestSecureBulkLoadManager.html | 127 +-
.../regionserver/TestSecureBulkloadListener.html | 96 +-
.../hbase/regionserver/TestSeekOptimizations.html | 197 +-
.../TestServerNonceManager.TestRunnable.html | 22 +-
.../hbase/regionserver/TestServerNonceManager.html | 67 +-
...ingTimeoutOnBlockingPoint.SleepCoprocessor.html | 10 +-
.../TestSettingTimeoutOnBlockingPoint.html | 66 +-
.../TestShutdownWhileWALBroken.MyRegionServer.html | 10 +-
.../regionserver/TestShutdownWhileWALBroken.html | 63 +-
.../regionserver/TestSimpleTimeRangeTracker.html | 66 +-
.../TestSplitLogWorker.DummyServer.html | 16 +-
.../hbase/regionserver/TestSplitLogWorker.html | 102 +-
...plitTransactionOnCluster.CustomSplitPolicy.html | 8 +-
...actionOnCluster.FailingSplitMasterObserver.html | 12 +-
.../TestSplitTransactionOnCluster.MyMaster.html | 6 +-
...itTransactionOnCluster.MyMasterRpcServices.html | 10 +-
.../TestSplitTransactionOnCluster.html | 133 +-
.../hbase/regionserver/TestSplitWalDataLoss.html | 59 +-
.../regionserver/TestSplitWithBlockingFiles.html | 42 +-
.../hbase/regionserver/TestStoreFileInfo.html | 29 +-
...ileRefresherChore.FailingHRegionFileSystem.html | 6 +-
...efresherChore.StaleStorefileRefresherChore.html | 8 +-
.../regionserver/TestStoreFileRefresherChore.html | 61 +-
.../hbase/regionserver/TestStoreFileScanner.html | 68 +-
.../TestStoreFileScannerWithTagCompression.html | 48 +-
.../hbase/regionserver/TestStoreFileWriter.html | 169 +-
.../hbase/regionserver/TestStoreScanner.html | 258 ++-
...stStoreScannerClosure.ExtendedStoreScanner.html | 10 +-
.../regionserver/TestStoreScannerClosure.html | 89 +-
.../TestStripeStoreEngine.TestStoreEngine.html | 6 +-
.../hbase/regionserver/TestStripeStoreEngine.html | 50 +-
.../regionserver/TestStripeStoreFileManager.html | 147 +-
...ToStreamRead.MatchLastRowCellNextColFilter.html | 6 +-
...ToStreamRead.MatchLastRowCellNextRowFilter.html | 6 +-
...chToStreamRead.MatchLastRowFilterRowFilter.html | 14 +-
...stSwitchToStreamRead.MatchLastRowKeyFilter.html | 6 +-
.../hbase/regionserver/TestSwitchToStreamRead.html | 75 +-
.../TestSyncTimeRangeTracker.RandomTestData.html | 14 +-
...TestSyncTimeRangeTracker.TrtUpdateRunnable.html | 10 +-
.../regionserver/TestSyncTimeRangeTracker.html | 34 +-
.../TestTableDescriptorHashComputation.html | 56 +-
.../regionserver/TestTimestampFilterSeekHint.html | 83 +-
...tWALMonotonicallyIncreasingSeqId.IncThread.html | 8 +-
...tWALMonotonicallyIncreasingSeqId.PutThread.html | 8 +-
.../TestWALMonotonicallyIncreasingSeqId.html | 103 +-
...pactingMemStoreFlush.ConcurrentPutRunnable.html | 10 +-
.../TestWalAndCompactingMemStoreFlush.html | 86 +-
.../hadoop/hbase/regionserver/TestWideScanner.html | 65 +-
.../org/apache/hadoop/hbase/wal/TestSecureWAL.html | 18 +-
.../regionserver/TestSCVFWithMiniCluster.html | 431 ++--
.../hbase/regionserver/TestScanWithBloomError.html | 323 ++-
.../hadoop/hbase/regionserver/TestScanner.html | 1048 +++++----
.../regionserver/TestScannerBlockSizeLimits.html | 530 +++--
...tScannerHeartbeatMessages.HeartbeatHRegion.html | 1218 ++++++-----
...erHeartbeatMessages.HeartbeatHRegionServer.html | 1218 ++++++-----
...stScannerHeartbeatMessages.HeartbeatKVHeap.html | 1218 ++++++-----
...nnerHeartbeatMessages.HeartbeatRPCServices.html | 1218 ++++++-----
...erHeartbeatMessages.HeartbeatRegionScanner.html | 1218 ++++++-----
...rHeartbeatMessages.HeartbeatReversedKVHeap.html | 1218 ++++++-----
...eatMessages.HeartbeatReversedRegionScanner.html | 1218 ++++++-----
...tScannerHeartbeatMessages.SparseCellFilter.html | 1218 ++++++-----
...stScannerHeartbeatMessages.SparseRowFilter.html | 1218 ++++++-----
.../regionserver/TestScannerHeartbeatMessages.html | 1218 ++++++-----
...rLeaseCount.MockedQuotaManagerRegionServer.html | 369 ++--
...estScannerLeaseCount.MockedRpcQuotaManager.html | 369 ++--
...eCount.ScannerTrackingRSRpcServicesForTest.html | 369 ++--
.../hbase/regionserver/TestScannerLeaseCount.html | 369 ++--
...PCScanMetrics.RSRPCServicesWithScanMetrics.html | 253 ++-
...RPCScanMetrics.RegionServerWithScanMetrics.html | 253 ++-
.../regionserver/TestScannerRPCScanMetrics.html | 253 ++-
...nnerRetriableFailure.FaultyScannerObserver.html | 283 ++-
.../regionserver/TestScannerRetriableFailure.html | 283 ++-
...meoutHandling.RSRpcServicesWithScanTimeout.html | 349 ++-
...imeoutHandling.RegionServerWithScanTimeout.html | 349 ++-
.../regionserver/TestScannerTimeoutHandling.html | 349 ++-
.../regionserver/TestScannerWithBulkload.html | 116 +-
...erWithCorruptHFile.CorruptHFileCoprocessor.html | 203 +-
.../regionserver/TestScannerWithCorruptHFile.html | 203 +-
...ureBulkLoadManager.MyExceptionToAvoidRetry.html | 468 ++--
.../regionserver/TestSecureBulkLoadManager.html | 468 ++--
.../regionserver/TestSecureBulkloadListener.html | 463 ++--
.../hbase/regionserver/TestSeekOptimizations.html | 802 ++++---
.../TestServerNonceManager.TestRunnable.html | 567 +++--
.../hbase/regionserver/TestServerNonceManager.html | 567 +++--
...ingTimeoutOnBlockingPoint.SleepCoprocessor.html | 220 +-
.../TestSettingTimeoutOnBlockingPoint.html | 220 +-
.../TestShutdownWhileWALBroken.MyRegionServer.html | 268 ++-
.../regionserver/TestShutdownWhileWALBroken.html | 268 ++-
.../regionserver/TestSimpleTimeRangeTracker.html | 236 +--
.../TestSplitLogWorker.DummyServer.html | 757 ++++---
.../hbase/regionserver/TestSplitLogWorker.html | 757 ++++---
...plitTransactionOnCluster.CustomSplitPolicy.html | 2232 ++++++++++----------
...actionOnCluster.FailingSplitMasterObserver.html | 2232 ++++++++++----------
.../TestSplitTransactionOnCluster.MyMaster.html | 2232 ++++++++++----------
...itTransactionOnCluster.MyMasterRpcServices.html | 2232 ++++++++++----------
.../TestSplitTransactionOnCluster.html | 2232 ++++++++++----------
.../hbase/regionserver/TestSplitWalDataLoss.html | 252 ++-
.../regionserver/TestSplitWithBlockingFiles.html | 239 +--
.../hbase/regionserver/TestStoreFileInfo.html | 211 +-
...ileRefresherChore.FailingHRegionFileSystem.html | 491 +++--
...efresherChore.StaleStorefileRefresherChore.html | 491 +++--
.../regionserver/TestStoreFileRefresherChore.html | 491 +++--
.../hbase/regionserver/TestStoreFileScanner.html | 202 +-
.../TestStoreFileScannerWithTagCompression.html | 196 +-
.../regionserver/TestStoreFileWriter.CellInfo.html | 517 +++--
.../hbase/regionserver/TestStoreFileWriter.html | 517 +++--
.../TestStoreScanner.CellGridStoreScanner.html | 507 +++--
...ner.CellWithVersionsNoOptimizeStoreScanner.html | 507 +++--
...tStoreScanner.CellWithVersionsStoreScanner.html | 507 +++--
.../TestStoreScanner.KeyValueHeapWithCount.html | 507 +++--
.../hbase/regionserver/TestStoreScanner.html | 507 +++--
...stStoreScannerClosure.ExtendedStoreScanner.html | 553 +++--
.../regionserver/TestStoreScannerClosure.html | 553 +++--
.../TestStripeStoreEngine.TestStoreEngine.html | 189 +-
.../hbase/regionserver/TestStripeStoreEngine.html | 189 +-
.../regionserver/TestStripeStoreFileManager.html | 1169 +++++-----
...ToStreamRead.MatchLastRowCellNextColFilter.html | 605 +++---
...ToStreamRead.MatchLastRowCellNextRowFilter.html | 605 +++---
...chToStreamRead.MatchLastRowFilterRowFilter.html | 605 +++---
...stSwitchToStreamRead.MatchLastRowKeyFilter.html | 605 +++---
.../hbase/regionserver/TestSwitchToStreamRead.html | 605 +++---
.../TestSyncTimeRangeTracker.RandomTestData.html | 301 ++-
...TestSyncTimeRangeTracker.TrtUpdateRunnable.html | 301 ++-
.../regionserver/TestSyncTimeRangeTracker.html | 301 ++-
.../TestTableDescriptorHashComputation.html | 191 +-
.../TestTags.TestCoprocessorForTags.html | 6 +-
.../apache/hadoop/hbase/regionserver/TestTags.html | 6 +-
.../hbase/regionserver/TestTagsReverseScan.html | 4 +-
.../regionserver/TestTimestampFilterSeekHint.html | 163 +-
...tWALMonotonicallyIncreasingSeqId.IncThread.html | 439 ++--
...tWALMonotonicallyIncreasingSeqId.PutThread.html | 439 ++--
.../TestWALMonotonicallyIncreasingSeqId.html | 439 ++--
...pactingMemStoreFlush.ConcurrentPutRunnable.html | 1969 +++++++++--------
.../TestWalAndCompactingMemStoreFlush.html | 1969 +++++++++--------
.../hadoop/hbase/regionserver/TestWideScanner.html | 278 ++-
.../org/apache/hadoop/hbase/wal/TestSecureWAL.html | 24 +-
264 files changed, 44877 insertions(+), 46288 deletions(-)
diff --git a/books/apache-hbase-reference-guide-dark-mode.pdf b/books/apache-hbase-reference-guide-dark-mode.pdf
index 2a837af68e8..9f5d30bc0a9 100644
Binary files a/books/apache-hbase-reference-guide-dark-mode.pdf and b/books/apache-hbase-reference-guide-dark-mode.pdf differ
diff --git a/books/apache-hbase-reference-guide.pdf b/books/apache-hbase-reference-guide.pdf
index 4e943e042f3..f9360a9ad34 100644
Binary files a/books/apache-hbase-reference-guide.pdf and b/books/apache-hbase-reference-guide.pdf differ
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index 8de8deaa732..7d36e969c5b 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-checkstyle-plugin:3.6.0:checkstyle-aggregate at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-checkstyle-plugin:3.6.0:checkstyle-aggregate at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -15097,13 +15097,13 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'for' construct must use '{}'s.</td>
-<td>153</td></tr>
+<td>146</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'for' construct must use '{}'s.</td>
-<td>181</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestScannerHeartbeatMessages.java"></a>
+<td>174</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestScannerHeartbeatMessages.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15117,25 +15117,25 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>638</td></tr>
+<td>632</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>640</td></tr>
+<td>634</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>658</td></tr>
+<td>652</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>660</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestScannerRPCScanMetrics.java"></a>
+<td>654</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestScannerRPCScanMetrics.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15149,7 +15149,7 @@
<td>blocks</td>
<td>EmptyBlock</td>
<td>Must have at least one statement.</td>
-<td>125</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestScannerRetriableFailure.java"></a>
+<td>116</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestScannerRetriableFailure.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15163,7 +15163,7 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>170</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestSecureBulkloadListener.java"></a>
+<td>161</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestSecureBulkloadListener.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15177,7 +15177,7 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>259</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestSeekOptimizations.java"></a>
+<td>245</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestSeekOptimizations.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15191,13 +15191,13 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>331</td></tr>
+<td>325</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>EmptyBlock</td>
<td>Must have at least one statement.</td>
-<td>441</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestServerNonceManager.java"></a>
+<td>435</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestServerNonceManager.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestServerNonceManager.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15211,13 +15211,13 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>236</td></tr>
+<td>231</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>260</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestSplitTransactionOnCluster.java"></a>
+<td>255</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestSplitTransactionOnCluster.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15231,37 +15231,37 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'for' construct must use '{}'s.</td>
-<td>762</td></tr>
+<td>757</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'for' construct must use '{}'s.</td>
-<td>789</td></tr>
+<td>784</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>1038</td></tr>
+<td>1033</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>1061</td></tr>
+<td>1056</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>1062</td></tr>
+<td>1057</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>1103</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestWalAndCompactingMemStoreFlush.java"></a>
+<td>1099</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2FTestWalAndCompactingMemStoreFlush.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.java</h3>
<table class="table table-striped">
<tr class="a">
@@ -15275,13 +15275,13 @@
<td>sizes</td>
<td>MethodLength</td>
<td>Method testSelectiveFlushWithEager length is 222 lines (max allowed is 150).</td>
-<td>138</td></tr>
+<td>133</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" /> Error</td>
<td>sizes</td>
<td>MethodLength</td>
<td>Method testSelectiveFlushWithIndexCompaction length is 260 lines (max allowed is 150).</td>
-<td>364</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2Fcompactions.2FCompactionProgress.java"></a>
+<td>359</td></tr></table></section><section><a id="org.2Fapache.2Fhadoop.2Fhbase.2Fregionserver.2Fcompactions.2FCompactionProgress.java"></a>
<h3>org/apache/hadoop/hbase/regionserver/compactions/CompactionProgress.java</h3>
<table class="table table-striped">
<tr class="a">
diff --git a/dependency-convergence.html b/dependency-convergence.html
index 95287ef725f..2286506fc0a 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-convergence at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-convergence at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/dependency-info.html b/dependency-info.html
index 38d701276b2..b87862274a9 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-info at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-info at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/dependency-management.html b/dependency-management.html
index f734c1b2439..649cfca8394 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-management at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-management at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/dependency-convergence.html b/hbase-website/dependency-convergence.html
index b0bd7a0256d..87305d5b373 100644
--- a/hbase-website/dependency-convergence.html
+++ b/hbase-website/dependency-convergence.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-convergence at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-convergence at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/dependency-info.html b/hbase-website/dependency-info.html
index d80c930d768..4788b682ebb 100644
--- a/hbase-website/dependency-info.html
+++ b/hbase-website/dependency-info.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-info at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-info at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/dependency-management.html b/hbase-website/dependency-management.html
index 54a47cd79d7..31f0c84d2aa 100644
--- a/hbase-website/dependency-management.html
+++ b/hbase-website/dependency-management.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-management at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:dependency-management at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/index.html b/hbase-website/index.html
index 9c95a448c89..2df991aacac 100644
--- a/hbase-website/index.html
+++ b/hbase-website/index.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:index at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:index at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/issue-management.html b/hbase-website/issue-management.html
index 24dee566a62..68dcce95d4b 100644
--- a/hbase-website/issue-management.html
+++ b/hbase-website/issue-management.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:issue-management at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:issue-management at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/licenses.html b/hbase-website/licenses.html
index 68e947743c3..23333d8d540 100644
--- a/hbase-website/licenses.html
+++ b/hbase-website/licenses.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:licenses at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:licenses at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/mailing-lists.html b/hbase-website/mailing-lists.html
index f062127d1ff..488e4d11cb3 100644
--- a/hbase-website/mailing-lists.html
+++ b/hbase-website/mailing-lists.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:mailing-lists at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:mailing-lists at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/plugin-management.html b/hbase-website/plugin-management.html
index ee42fd14f4e..89404532066 100644
--- a/hbase-website/plugin-management.html
+++ b/hbase-website/plugin-management.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugin-management at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugin-management at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/plugins.html b/hbase-website/plugins.html
index 3d891e46a97..0d6eb2e4b32 100644
--- a/hbase-website/plugins.html
+++ b/hbase-website/plugins.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugins at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugins at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/project-info.html b/hbase-website/project-info.html
index 496acf70140..9de76a9c4f9 100644
--- a/hbase-website/project-info.html
+++ b/hbase-website/project-info.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-info at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-info at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/scm.html b/hbase-website/scm.html
index d626bb73558..a412906d47c 100644
--- a/hbase-website/scm.html
+++ b/hbase-website/scm.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:scm at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:scm at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/summary.html b/hbase-website/summary.html
index 8af8e1b693f..b4d5328b7f9 100644
--- a/hbase-website/summary.html
+++ b/hbase-website/summary.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:summary at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:summary at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/hbase-website/team.html b/hbase-website/team.html
index 6b36825f70d..8a7aeeee307 100644
--- a/hbase-website/team.html
+++ b/hbase-website/team.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:team at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:team at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/issue-management.html b/issue-management.html
index 86fd4bb0eba..e81906a8ad0 100644
--- a/issue-management.html
+++ b/issue-management.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:issue-management at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:issue-management at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/licenses.html b/licenses.html
index 772ddd6d023..f845ac788e0 100644
--- a/licenses.html
+++ b/licenses.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:licenses at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:licenses at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/mailing-lists.html b/mailing-lists.html
index a02965dbdc6..4a226672fa3 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:mailing-lists at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:mailing-lists at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/plugin-management.html b/plugin-management.html
index e90934d8606..6f5e4ce7019 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugin-management at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugin-management at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/plugins.html b/plugins.html
index f002c0eec2f..268bc650b23 100644
--- a/plugins.html
+++ b/plugins.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugins at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:plugins at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/project-info.html b/project-info.html
index 83ea761e627..8df8260db8f 100644
--- a/project-info.html
+++ b/project-info.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-info at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-info at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/project-reports.html b/project-reports.html
index 28691063067..9c011d5ca25 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-reports at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-site-plugin:3.21.0:project-reports at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/scm.html b/scm.html
index c5a7bd2af83..9008884b827 100644
--- a/scm.html
+++ b/scm.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:scm at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:scm at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/summary.html b/summary.html
index 21e95e59206..54657cb6e73 100644
--- a/summary.html
+++ b/summary.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:summary at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:summary at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/team.html b/team.html
index 692ba9ee9bd..bcd07359135 100644
--- a/team.html
+++ b/team.html
@@ -2,7 +2,7 @@
<!--
- | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:team at 2026-05-11
+ | Generated by Apache Maven Doxia Site Renderer 2.0.0 from org.apache.maven.plugins:maven-project-info-reports-plugin:3.9.0:team at 2026-05-13
| Rendered using Apache Maven Fluido Skin 2.0.0-M9
-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
diff --git a/testapidocs/index-all.html b/testapidocs/index-all.html
index 2f2185e4f50..d989134e0d0 100644
--- a/testapidocs/index-all.html
+++ b/testapidocs/index-all.html
@@ -2787,82 +2787,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRSSnapshotVerifier.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRSSnapshotVerifier.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestRSSnapshotVerifier</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScanner</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerBlockSizeLim [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerHeartbea [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerLeaseCount</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerRetriableF [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerRPCScanMetrics [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerTimeoutHandl [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerWithBulkload</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerWithCorrup [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScanWithBloomError</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSCVFWithMiniCluster</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkloadListe [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkLoadManager [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSeekOptimizations</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestServerNonceManager</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSetti [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestShutdownWhileWALBro [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSimpleTimeRangeTracker.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSimpleTimeRangeTracker.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSimpleTimeRangeTrac [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitLogWorker</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitTransact [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitWalDataLoss</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWithBlockingFiles.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWithBlockingFiles.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitWithBlockingFi [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileInfo</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileRefreshe [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileScanner</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link" [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileWriter</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreScanner</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScannerClosure.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScannerClosure.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreScannerClosure</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStripeStoreEngine</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStripeStoreFileMana [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSwitchToStreamRead</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSyncTimeRangeTracker</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTableDescriptorHashComputation.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTableDescriptorHashComputation.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestTab [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTimestampFilterSeekHint.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTimestampFilterSeekHint.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestTimestampFilterSe [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWalAn [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestW [...]
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWideScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWideScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWideScanner</a></dt>
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestAddToSerialReplicationPeer.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestAddToSerialReplicationPeer.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">TestAddToSerialRepli [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestBidirectionSerialReplicationStuck.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">CLASS_RULE</a> - Static variable in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestBidirectionSerialReplicationStuck.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">TestBi [...]
@@ -5105,12 +5029,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.html#data()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">data()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestMajorCompaction</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html#data()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">data()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkLoadManager</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#data()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">data()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileWriter</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#data()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">data()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWALMonotoni [...]
-<dd> </dd>
<dt>DATA_ISSUE_CHANCE - Static variable in interface org.apache.hadoop.hbase.chaos.factories.MonkeyConstants</dt>
<dd> </dd>
<dt>DATA_ISSUES - Static variable in class org.apache.hadoop.hbase.chaos.factories.MonkeyFactory</dt>
@@ -12777,30 +12695,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRowPrefixBloomFilter.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRowPrefixBloomFilter.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestRowPrefixBloomFilter</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScanner</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerRPCScanMetrics</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerTimeoutHandling</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerWithBulkload</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerWithCorruptHFile</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkloadListener</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitTransactionOnCluster</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileRefresherChore</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileScanner</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreScanner</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScannerClosure.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScannerClosure.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreScannerClosure</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">name</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWALMonotonicallyIncr [...]
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">name</a> - Variable in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/SerialReplicationTestBase.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">SerialReplicationTestBase</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html#name" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">name</a> - Variable in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">TestPerTableCFReplication</a></dt>
@@ -13634,10 +13528,18 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScanWithBloomError</a></dt>
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkLoadManag [...]
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSeekOptimizations</a></dt>
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestShutdownWhileWALB [...]
+<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileWriter</a></dt>
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTagsReverseScan.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTagsReverseScan.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestTagsReverseScan</a></dt>
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">Tes [...]
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/TestDurability.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.wal">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.wal.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/TestDurability.html" title="class or interface in org.apache.hadoop.hbase.regionserver.wal" class="external-link">TestDurability</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/TestHBaseWalOnEC.html#parameters()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.wal">parameters()</a> - Static method in class org.apache.hadoop.hbase.regionserver.wal.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/TestHBaseWalOnEC.html" title="class or interface in org.apache.hadoop.hbase.regionserver.wal" class="external-link">TestHBaseWalOnEC</a></dt>
@@ -13734,8 +13636,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.html#params()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">params()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRegionReplicasWithModifyTable.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestRegionRepli [...]
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html#params()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">params()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestShutdownWhileWALBroken</a></dt>
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/types/TestStruct.html#params()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.types">params()</a> - Static method in class org.apache.hadoop.hbase.types.<a href="../apidocs/org/apache/hadoop/hbase/types/TestStruct.html" title="class or interface in org.apache.hadoop.hbase.types" class="external-link">TestStruct</a></dt>
<dd> </dd>
<dt>parent() - Method in class org.apache.hadoop.hbase.test.MetricsAssertHelperImpl.MockRecordBuilder</dt>
@@ -16827,6 +16727,10 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/master/TestRollingRestart.html#setTestMethod(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.master">setTestMethod(TestInfo)</a> - Method in class org.apache.hadoop.hbase.master.<a href="../apidocs/org/apache/hadoop/hbase/master/TestRollingRestart.html" title="class or interface in org.apache.hadoop.hbase.master" class="external-link">TestRollingRestart</a></dt>
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html#setTestName(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setTestName(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external- [...]
+<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html#setTestName(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setTestName(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStor [...]
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/coprocessor/SampleRegionWALCoprocessor.html#setTestValues(byte%5B%5D,byte%5B%5D,byte%5B%5D,byte%5B%5D,byte%5B%5D,byte%5B%5D,byte%5B%5D,byte%5B%5D)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.coprocessor">setTestValues(byte[], byte[], byte[], byte[], byte[], byte[], byte[], byte[])</a> - Method in class org.apache.hadoop.hbase.coprocessor.<a href="../apidocs/org/apache/hadoop/hbase/coprocessor [...]
<dd>
<div class="block">Set values: with a table name, a column name which will be ignored, and a column name which
@@ -17012,8 +16916,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.html#setup()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setup()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitLogWorker</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#setup()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setup()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitTransactionOnCluster</a></dt>
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.html#setup()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setup()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWalAndCompactingMemS [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestNonHBaseReplicationEndpoint.html#setup()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">setup()</a> - Method in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestNonHBaseReplicationEndpoint.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">TestNonHBaseReplicationEndpoint</a></dt>
@@ -17088,6 +16990,8 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/quotas/TestSnapshotQuotaObserverChore.html#setup(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.quotas">setup(TestInfo)</a> - Method in class org.apache.hadoop.hbase.quotas.<a href="../apidocs/org/apache/hadoop/hbase/quotas/TestSnapshotQuotaObserverChore.html" title="class or interface in org.apache.hadoop.hbase.quotas" class="external-link">TestSnapshotQuotaObser [...]
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#setup(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setup(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external- [...]
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.html#setup(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase">setup(TestInfo)</a> - Method in class org.apache.hadoop.hbase.<a href="../apidocs/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">TestColumnFamilyDescriptorDefaultVe [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/TestMovedRegionCache.html#setup(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase">setup(TestInfo)</a> - Method in class org.apache.hadoop.hbase.<a href="../apidocs/org/apache/hadoop/hbase/TestMovedRegionCache.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">TestMovedRegionCache</a></dt>
@@ -17738,8 +17642,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSCVFWithMiniCluster</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkloadListener</a></dt>
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkLoadManager</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSeekOptimizations</a></dt>
@@ -17748,10 +17650,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSplitWalDataLoss</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileRefresherChore</a></dt>
-<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileScanner</a></dt>
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSto [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileWriter</a></dt>
@@ -17762,8 +17660,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSwitchToStreamRead</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWALMonotonically [...]
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWideScanner.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWideScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestWideScanner</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.html#setUp()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.wal">setUp()</a> - Method in class org.apache.hadoop.hbase.regionserver.wal.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.html" title="class or interface in org.apache.hadoop.hbase.regionserver.wal" class="external-link">AbstractTestLogRolling</a></dt>
@@ -18084,6 +17980,14 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/storefiletracker/TestStoreFileListFile.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.storefiletracker">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.storefiletracker.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/storefiletracker/TestStoreFileListFile.html" title="class or interface in or [...]
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link"> [...]
+<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link [...]
+<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFil [...]
+<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" clas [...]
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.throttle">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.throttle.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.html" title="class or interface in org.apache [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.html#setUp(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.wal">setUp(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.wal.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.html" title="class or interface in org.apache.hadoop.hbase.regionserver.wal" class="external-link [...]
@@ -18136,8 +18040,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestCompactionToolNpeFix.html#setUpAfterClass()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUpAfterClass()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestCompactionToolNpeFix.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestCompactionT [...]
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#setUpAfterClass()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUpAfterClass()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-lin [...]
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestBulkLoadReplication.html#setUpBase()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">setUpBase()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestBulkLoadReplication.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestBulkLoadReplication</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestBidirectionSerialReplicationStuck.html#setUpBase()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">setUpBase()</a> - Method in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestBidirectionSerialReplicationStuck.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">TestBidirecti [...]
@@ -21377,6 +21279,8 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html#tearDown()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDown()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSCVFWithMiniCluster</a></dt>
<dd> </dd>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#tearDown()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDown()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkloadListener</a></dt>
+<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html#tearDown()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDown()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkLoadManager</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html#tearDown()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDown()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSeekOptimizations</a></dt>
@@ -21965,7 +21869,7 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html#tearDownAfterClass()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDownAfterClass()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScanner [...]
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#tearDownAfterClass()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDownAfterClass()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBu [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#tearDownAfterClass()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDownAfterClass()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="extern [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTags.html#tearDownAfterClass()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tearDownAfterClass()</a> - Static method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestTags.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestTags</a></dt>
<dd> </dd>
@@ -28892,7 +28796,7 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/util/TestFastStringPool.html#%3Cinit%3E()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.util">TestFastStringPool()</a> - Constructor for class org.apache.hadoop.hbase.util.<a href="../apidocs/org/apache/hadoop/hbase/util/TestFastStringPool.html" title="class or interface in org.apache.hadoop.hbase.util" class="external-link">TestFastStringPool</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html#testFaultyScanner()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testFaultyScanner()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerR [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html#testFaultyScanner(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testFaultyScanner(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html" title="class or interface in org.apache.hadoop.hbase.regionserv [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/favored/TestFavoredNodeAssignmentHelper.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.favored">TestFavoredNodeAssignmentHelper</a> - Class in <a href="org/apache/hadoop/hbase/favored/package-summary.html">org.apache.hadoop.hbase.favored</a></dt>
<dd> </dd>
@@ -29408,8 +29312,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestBulkLoadReplicationHFileRefs.html#testFolder" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testFolder</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestBulkLoadReplicationHFileRefs.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestBulkLoa [...]
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#testFolder" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testFolder</a> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSecureBulkloadListe [...]
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html#testForbidden()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.rest">testForbidden()</a> - Method in class org.apache.hadoop.hbase.rest.<a href="../apidocs/org/apache/hadoop/hbase/rest/TestGetAndPutResource.html" title="class or interface in org.apache.hadoop.hbase.rest" class="external-link">TestGetAndPutResource</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.io.hfile">TestForceCacheImportantBlocks</a> - Class in <a href="org/apache/hadoop/hbase/io/hfile/package-summary.html">org.apache.hadoop.hbase.io.hfile</a></dt>
@@ -35217,8 +35119,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.html#testName" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testName</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestRSKilledWhenInitializing</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#testName" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testName</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSettingTimeoutOn [...]
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.html#testName" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.wal">testName</a> - Variable in class org.apache.hadoop.hbase.regionserver.wal.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestFSWAL.html" title="class or interface in org.apache.hadoop.hbase.regionserver.wal" class="external-link">AbstractTestFSWAL</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.html#testNameConflictWhenSplit0()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.wal">testNameConflictWhenSplit0()</a> - Method in class org.apache.hadoop.hbase.regionserver.wal.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.html" title="class or interface in org.apache.hadoop.hbase.regionserver.wal" class="e [...]
@@ -39513,7 +39413,7 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.html#testRowKeyPrefixWithoutLastIncrementablePrefix()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.filter">testRowKeyPrefixWithoutLastIncrementablePrefix()</a> - Method in class org.apache.hadoop.hbase.filter.<a href="../apidocs/org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.html" title="class or interface in org.apache.hadoop.hbase.filter" class="externa [...]
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#testRowLock()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testRowLock()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSettingT [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#testRowLock(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testRowLock(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html" title="class or interface in org.apache.hadoop.hbase.regionserv [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.html#testRowMutation()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.coprocessor">testRowMutation()</a> - Method in class org.apache.hadoop.hbase.coprocessor.<a href="../apidocs/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.html" title="class or interface in org.apache.hadoop.hbase.coprocessor" class="external-link">TestRegionObserverInt [...]
<dd> </dd>
@@ -39954,7 +39854,7 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/client/TestAsyncTableTracing.html#testScanAll()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.client">testScanAll()</a> - Method in class org.apache.hadoop.hbase.client.<a href="../apidocs/org/apache/hadoop/hbase/client/TestAsyncTableTracing.html" title="class or interface in org.apache.hadoop.hbase.client" class="external-link">TestAsyncTableTracing</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html#testScanAndConcurrentMajorCompact()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testScanAndConcurrentMajorCompact()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScanner< [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html#testScanAndConcurrentMajorCompact(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testScanAndConcurrentMajorCompact(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html" title="class or interface in org.apache.hadoop.hbase.regionserv [...]
<dd>
<div class="block">Make sure scanner returns correct result when we run a major compaction with deletes.</div>
</dd>
@@ -40221,7 +40121,7 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestScannerRetriableFailure.FaultyScannerObserver</a> - Class in <a href="org/apache/hadoop/hbase/regionserver/package-summary.html">org.apache.hadoop.hbase.regionserver</a></dt>
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html#testScannerRPCScanMetrics()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testScannerRPCScanMetrics()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link"> [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html#testScannerRPCScanMetrics(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testScannerRPCScanMetrics(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html" title="class or interface in org.apache.hadoop.hbas [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestScannerRPCScanMetrics</a> - Class in <a href="org/apache/hadoop/hbase/regionserver/package-summary.html">org.apache.hadoop.hbase.regionserver</a></dt>
<dd> </dd>
@@ -40331,7 +40231,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Tests a MR scan using specific start and stop rows.</div>
</dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html#testScanOnCorruptHFile()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testScanOnCorruptHFile()</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">Te [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html#testScanOnCorruptHFile(org.junit.jupiter.api.TestInfo)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testScanOnCorruptHFile(TestInfo)</a> - Method in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html" title="class or interface in org.apache.hadoop.hbase. [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/client/TestScannersFromClientSide.html#testScanOnReopenedRegion()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.client">testScanOnReopenedRegion()</a> - Method in class org.apache.hadoop.hbase.client.<a href="../apidocs/org/apache/hadoop/hbase/client/TestScannersFromClientSide.html" title="class or interface in org.apache.hadoop.hbase.client" class="external-link">TestScannersFromClientSide</a></dt>
<dd>
@@ -41296,7 +41196,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">See HBASE-19929 for more details.</div>
</dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html#%3Cinit%3E()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestShutdownWhileWALBroken()</a> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestSh [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html#%3Cinit%3E(java.lang.String)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestShutdownWhileWALBroken(String)</a> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class= [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.MyRegionServer.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestShutdownWhileWALBroken.MyRegionServer</a> - Class in <a href="org/apache/hadoop/hbase/regionserver/package-summary.html">org.apache.hadoop.hbase.regionserver</a></dt>
<dd> </dd>
@@ -42324,7 +42224,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Store file writer does not do any compaction.</div>
</dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#%3Cinit%3E()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestStoreFileWriter()</a> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestStoreFileWriter</a></dt>
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#%3Cinit%3E(org.apache.hadoop.hbase.KeepDeletedCells,int,boolean)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestStoreFileWriter(KeepDeletedCells, int, boolean)</a> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" title="class or interface in org.a [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver.throttle">TestStoreHotnessProtector</a> - Class in <a href="org/apache/hadoop/hbase/regionserver/throttle/package-summary.html">org.apache.hadoop.hbase.regionserver.throttle</a></dt>
<dd> </dd>
@@ -42572,8 +42472,6 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.html#testSystemTableWALEntryFilter()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">testSystemTableWALEntryFilter()</a> - Method in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.html" title="class or interface in org.apache.hadoop.hbase.replication" class="ex [...]
<dd> </dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html#testTable" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testTable</a> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html" title="class or interface in org.apache.hadoop.hbase.regionserver" class="external-link">TestScannerRetriableFailure</a></dt>
-<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/http/TestInfoServersACL.html#testTableActionsAvailableForAdmins()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.http">testTableActionsAvailableForAdmins()</a> - Method in class org.apache.hadoop.hbase.http.<a href="../apidocs/org/apache/hadoop/hbase/http/TestInfoServersACL.html" title="class or interface in org.apache.hadoop.hbase.http" class="external-link">TestInfoServersACL</a></dt>
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html#testTableCFsHelperConverter()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.replication">testTableCFsHelperConverter()</a> - Method in class org.apache.hadoop.hbase.replication.<a href="../apidocs/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.html" title="class or interface in org.apache.hadoop.hbase.replication" class="external-link">T [...]
@@ -44053,7 +43951,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Test for HBASE-17471.</div>
</dd>
-<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#%3Cinit%3E()" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestWALMonotonicallyIncreasingSeqId()</a> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop.hbase.regionserver" c [...]
+<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#%3Cinit%3E(java.lang.String)" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestWALMonotonicallyIncreasingSeqId(String)</a> - Constructor for class org.apache.hadoop.hbase.regionserver.<a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" title="class or interface in org.apache.hadoop [...]
<dd> </dd>
<dt><a href="../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.IncThread.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestWALMonotonicallyIncreasingSeqId.IncThread</a> - Class in <a href="org/apache/hadoop/hbase/regionserver/package-summary.html">org.apache.hadoop.hbase.regionserver</a></dt>
<dd> </dd>
diff --git a/testapidocs/member-search-index.js b/testapidocs/member-search-index.js
index f093d006483..4062ea309c4 100644
--- a/testapidocs/member-search-index.js
+++ b/testapidocs/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"org.apache.hadoop.hbase.backup","c":"TestSystemTableSnapshot","l":"_testBackupRestoreSystemTable()"},{"p":"org.apache.hadoop.hbase.coprocessor","c":"TestRegionObserverInterface","l":"A"},{"p":"org.apache.hadoop.hbase.client","c":"TestGetProcedureResult.DummyProcedure","l":"abort(MasterProcedureEnv)","u":"abort(org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv)"},{"p":"org.apache.hadoop.hbase.master","c":"TestMigrateNamespaceTable.SuspendProcedure","l" [...]
\ No newline at end of file
+memberSearchIndex = [{"p":"org.apache.hadoop.hbase.backup","c":"TestSystemTableSnapshot","l":"_testBackupRestoreSystemTable()"},{"p":"org.apache.hadoop.hbase.coprocessor","c":"TestRegionObserverInterface","l":"A"},{"p":"org.apache.hadoop.hbase.client","c":"TestGetProcedureResult.DummyProcedure","l":"abort(MasterProcedureEnv)","u":"abort(org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv)"},{"p":"org.apache.hadoop.hbase.master","c":"TestMigrateNamespaceTable.SuspendProcedure","l" [...]
\ No newline at end of file
diff --git a/testapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html b/testapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
index d88a4d47f7a..a7ff5da5b80 100644
--- a/testapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
+++ b/testapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
@@ -1383,120 +1383,6 @@ loadScripts(document, 'script');</script>
<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
<div class="col-second even-row-color"><span class="type-name-label">TestRSSnapshotVerifier.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestRSSnapshotVerifier.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestScanner.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestScannerBlockSizeLimits.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestScannerHeartbeatMessages.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestScannerLeaseCount.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestScannerRetriableFailure.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestScannerRPCScanMetrics.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestScannerTimeoutHandling.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestScannerWithBulkload.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestScannerWithCorruptHFile.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestScanWithBloomError.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestSCVFWithMiniCluster.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSecureBulkloadListener.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkloadListener.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestSecureBulkLoadManager.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSeekOptimizations.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestServerNonceManager.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSettingTimeoutOnBlockingPoint.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSettingTimeoutOnBlockingPoint.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestShutdownWhileWALBroken.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSimpleTimeRangeTracker.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSimpleTimeRangeTracker.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestSplitLogWorker.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSplitTransactionOnCluster.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestSplitWalDataLoss.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSplitWithBlockingFiles.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSplitWithBlockingFiles.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestStoreFileInfo.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestStoreFileRefresherChore.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestStoreFileScanner.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestStoreFileScannerWithTagCompression.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestStoreFileWriter.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestStoreScanner.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestStoreScannerClosure.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreScannerClosure.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestStripeStoreEngine.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestStripeStoreFileManager.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestSwitchToStreamRead.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestSyncTimeRangeTracker.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSyncTimeRangeTracker.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestTableDescriptorHashComputation.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestTableDescriptorHashComputation.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestTimestampFilterSeekHint.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestTimestampFilterSeekHint.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestWalAndCompactingMemStoreFlush.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestWalAndCompactingMemStoreFlush.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second odd-row-color"><span class="type-name-label">TestWALMonotonicallyIncreasingSeqId.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code>static final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">HBaseClassTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestWideScanner.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestWideScanner.html#CLASS_RULE" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">CLASS_RULE</a></code></div>
-<div class="col-last even-row-color"> </div>
</div>
</section>
</li>
diff --git a/testapidocs/org/apache/hadoop/hbase/class-use/HBaseParameterizedTestTemplate.html b/testapidocs/org/apache/hadoop/hbase/class-use/HBaseParameterizedTestTemplate.html
index dbbf0fbb344..cd767fc0c2d 100644
--- a/testapidocs/org/apache/hadoop/hbase/class-use/HBaseParameterizedTestTemplate.html
+++ b/testapidocs/org/apache/hadoop/hbase/class-use/HBaseParameterizedTestTemplate.html
@@ -658,8 +658,37 @@ loadScripts(document, 'script');</script>
<div class="table-header col-second">Class</div>
<div class="table-header col-last">Description</div>
<div class="col-first even-row-color"><code>class </code></div>
-<div class="col-second even-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestTagsReverseScan.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestTagsReverseScan</a></code></div>
-<div class="col-last even-row-color"> </div>
+<div class="col-second even-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestScanWithBloomError</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Test a multi-column scanner when there is a Bloom filter false-positive.</div>
+</div>
+<div class="col-first odd-row-color"><code>class </code></div>
+<div class="col-second odd-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManager.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestSecureBulkLoadManager</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>class </code></div>
+<div class="col-second even-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestSeekOptimizations</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Test various seek optimizations for correctness and check if they are actually saving I/O
+ operations.</div>
+</div>
+<div class="col-first odd-row-color"><code>class </code></div>
+<div class="col-second odd-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestShutdownWhileWALBroken.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestShutdownWhileWALBroken</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block">See HBASE-19929 for more details.</div>
+</div>
+<div class="col-first even-row-color"><code>class </code></div>
+<div class="col-second even-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestStoreFileWriter.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestStoreFileWriter</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Store file writer does not do any compaction.</div>
+</div>
+<div class="col-first odd-row-color"><code>class </code></div>
+<div class="col-second odd-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestTagsReverseScan.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestTagsReverseScan</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>class </code></div>
+<div class="col-second even-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestWALMonotonicallyIncreasingSeqId.html" class="type-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">TestWALMonotonicallyIncreasingSeqId</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Test for HBASE-17471.</div>
+</div>
</div>
</section>
</li>
diff --git a/testapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html b/testapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html
index d1bae3284b2..fa98bd6cfef 100644
--- a/testapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html
+++ b/testapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html
@@ -111,9 +111,6 @@ loadScripts(document, 'script');</script>
<div class="col-first odd-row-color"><code>final <a href="../../../../../../apidocs/org/apache/hadoop/hbase/TableNameTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">TableNameTestRule</a></code></div>
<div class="col-second odd-row-color"><span class="type-name-label">TestHRegionTracing.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestHRegionTracing.html#tableNameRule" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">tableNameRule</a></code></div>
<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/TableNameTestRule.html" title="class or interface in org.apache.hadoop.hbase" class="external-link">TableNameTestRule</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">TestScannerRetriableFailure.</span><code><a href="../../../../../../apidocs/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html#testTable" class="member-name-link external-link" title="class or interface in org.apache.hadoop.hbase.regionserver">testTable</a></code></div>
-<div class="col-last even-row-color"> </div>
</div>
</section>
</li>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html
index 7fc77083e54..3018d39ea63 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.html
@@ -30,235 +30,230 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static junit.framework.Assert.assertEquals;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
<span class="source-line-no">021</span><span id="line-21"></span>
<span class="source-line-no">022</span><span id="line-22">import java.io.IOException;</span>
<span class="source-line-no">023</span><span id="line-23">import java.util.ArrayList;</span>
<span class="source-line-no">024</span><span id="line-24">import java.util.Iterator;</span>
<span class="source-line-no">025</span><span id="line-25">import java.util.List;</span>
<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.CompareOperator;</span>
-<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.TableExistsException;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.TableNotFoundException;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Admin;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Durability;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.filter.BinaryComparator;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.filter.Filter;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.junit.AfterClass;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.junit.BeforeClass;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.junit.ClassRule;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.Test;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55">@Category({ RegionServerTests.class, MediumTests.class })</span>
-<span class="source-line-no">056</span><span id="line-56">/*</span>
-<span class="source-line-no">057</span><span id="line-57"> * This test verifies that the scenarios illustrated by HBASE-10850 work w.r.t. essential column</span>
-<span class="source-line-no">058</span><span id="line-58"> * family optimization</span>
-<span class="source-line-no">059</span><span id="line-59"> */</span>
-<span class="source-line-no">060</span><span id="line-60">public class TestSCVFWithMiniCluster {</span>
-<span class="source-line-no">061</span><span id="line-61"></span>
-<span class="source-line-no">062</span><span id="line-62"> @ClassRule</span>
-<span class="source-line-no">063</span><span id="line-63"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">064</span><span id="line-64"> HBaseClassTestRule.forClass(TestSCVFWithMiniCluster.class);</span>
+<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.TableExistsException;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.TableNotFoundException;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.Admin;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Durability;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.filter.BinaryComparator;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.filter.Filter;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">052</span><span id="line-52"></span>
+<span class="source-line-no">053</span><span id="line-53">/*</span>
+<span class="source-line-no">054</span><span id="line-54"> * This test verifies that the scenarios illustrated by HBASE-10850 work w.r.t. essential column</span>
+<span class="source-line-no">055</span><span id="line-55"> * family optimization</span>
+<span class="source-line-no">056</span><span id="line-56"> */</span>
+<span class="source-line-no">057</span><span id="line-57">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">058</span><span id="line-58">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">059</span><span id="line-59">public class TestSCVFWithMiniCluster {</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61"> private static final TableName HBASE_TABLE_NAME = TableName.valueOf("TestSCVFWithMiniCluster");</span>
+<span class="source-line-no">062</span><span id="line-62"></span>
+<span class="source-line-no">063</span><span id="line-63"> private static final byte[] FAMILY_A = Bytes.toBytes("a");</span>
+<span class="source-line-no">064</span><span id="line-64"> private static final byte[] FAMILY_B = Bytes.toBytes("b");</span>
<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> private static final TableName HBASE_TABLE_NAME = TableName.valueOf("TestSCVFWithMiniCluster");</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68"> private static final byte[] FAMILY_A = Bytes.toBytes("a");</span>
-<span class="source-line-no">069</span><span id="line-69"> private static final byte[] FAMILY_B = Bytes.toBytes("b");</span>
+<span class="source-line-no">066</span><span id="line-66"> private static final byte[] QUALIFIER_FOO = Bytes.toBytes("foo");</span>
+<span class="source-line-no">067</span><span id="line-67"> private static final byte[] QUALIFIER_BAR = Bytes.toBytes("bar");</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69"> private static Table htable;</span>
<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71"> private static final byte[] QUALIFIER_FOO = Bytes.toBytes("foo");</span>
-<span class="source-line-no">072</span><span id="line-72"> private static final byte[] QUALIFIER_BAR = Bytes.toBytes("bar");</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74"> private static Table htable;</span>
-<span class="source-line-no">075</span><span id="line-75"></span>
-<span class="source-line-no">076</span><span id="line-76"> private static Filter scanFilter;</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78"> private int expected = 1;</span>
-<span class="source-line-no">079</span><span id="line-79"></span>
-<span class="source-line-no">080</span><span id="line-80"> @BeforeClass</span>
-<span class="source-line-no">081</span><span id="line-81"> public static void setUp() throws Exception {</span>
-<span class="source-line-no">082</span><span id="line-82"> HBaseTestingUtil util = new HBaseTestingUtil();</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84"> util.startMiniCluster(1);</span>
-<span class="source-line-no">085</span><span id="line-85"></span>
-<span class="source-line-no">086</span><span id="line-86"> Admin admin = util.getAdmin();</span>
-<span class="source-line-no">087</span><span id="line-87"> destroy(admin, HBASE_TABLE_NAME);</span>
-<span class="source-line-no">088</span><span id="line-88"> create(admin, HBASE_TABLE_NAME, FAMILY_A, FAMILY_B);</span>
-<span class="source-line-no">089</span><span id="line-89"> admin.close();</span>
-<span class="source-line-no">090</span><span id="line-90"> htable = util.getConnection().getTable(HBASE_TABLE_NAME);</span>
-<span class="source-line-no">091</span><span id="line-91"></span>
-<span class="source-line-no">092</span><span id="line-92"> /* Add some values */</span>
-<span class="source-line-no">093</span><span id="line-93"> List<Put> puts = new ArrayList<>();</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95"> /* Add a row with 'a:foo' = false */</span>
-<span class="source-line-no">096</span><span id="line-96"> Put put = new Put(Bytes.toBytes("1"));</span>
-<span class="source-line-no">097</span><span id="line-97"> put.setDurability(Durability.SKIP_WAL);</span>
-<span class="source-line-no">098</span><span id="line-98"> put.addColumn(FAMILY_A, QUALIFIER_FOO, Bytes.toBytes("false"));</span>
-<span class="source-line-no">099</span><span id="line-99"> put.addColumn(FAMILY_A, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">100</span><span id="line-100"> put.addColumn(FAMILY_B, QUALIFIER_FOO, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">101</span><span id="line-101"> put.addColumn(FAMILY_B, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">102</span><span id="line-102"> puts.add(put);</span>
-<span class="source-line-no">103</span><span id="line-103"></span>
-<span class="source-line-no">104</span><span id="line-104"> /* Add a row with 'a:foo' = true */</span>
-<span class="source-line-no">105</span><span id="line-105"> put = new Put(Bytes.toBytes("2"));</span>
-<span class="source-line-no">106</span><span id="line-106"> put.setDurability(Durability.SKIP_WAL);</span>
-<span class="source-line-no">107</span><span id="line-107"> put.addColumn(FAMILY_A, QUALIFIER_FOO, Bytes.toBytes("true"));</span>
-<span class="source-line-no">108</span><span id="line-108"> put.addColumn(FAMILY_A, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">109</span><span id="line-109"> put.addColumn(FAMILY_B, QUALIFIER_FOO, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">110</span><span id="line-110"> put.addColumn(FAMILY_B, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">111</span><span id="line-111"> puts.add(put);</span>
-<span class="source-line-no">112</span><span id="line-112"></span>
-<span class="source-line-no">113</span><span id="line-113"> /* Add a row with 'a:foo' qualifier not set */</span>
-<span class="source-line-no">114</span><span id="line-114"> put = new Put(Bytes.toBytes("3"));</span>
-<span class="source-line-no">115</span><span id="line-115"> put.setDurability(Durability.SKIP_WAL);</span>
-<span class="source-line-no">116</span><span id="line-116"> put.addColumn(FAMILY_A, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">117</span><span id="line-117"> put.addColumn(FAMILY_B, QUALIFIER_FOO, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">118</span><span id="line-118"> put.addColumn(FAMILY_B, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
-<span class="source-line-no">119</span><span id="line-119"> puts.add(put);</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121"> htable.put(puts);</span>
-<span class="source-line-no">122</span><span id="line-122"> /*</span>
-<span class="source-line-no">123</span><span id="line-123"> * We want to filter out from the scan all rows that do not have the column 'a:foo' with value</span>
-<span class="source-line-no">124</span><span id="line-124"> * 'false'. Only row with key '1' should be returned in the scan.</span>
-<span class="source-line-no">125</span><span id="line-125"> */</span>
-<span class="source-line-no">126</span><span id="line-126"> scanFilter = new SingleColumnValueFilter(FAMILY_A, QUALIFIER_FOO, CompareOperator.EQUAL,</span>
-<span class="source-line-no">127</span><span id="line-127"> new BinaryComparator(Bytes.toBytes("false")));</span>
-<span class="source-line-no">128</span><span id="line-128"> ((SingleColumnValueFilter) scanFilter).setFilterIfMissing(true);</span>
+<span class="source-line-no">071</span><span id="line-71"> private static Filter scanFilter;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73"> private int expected = 1;</span>
+<span class="source-line-no">074</span><span id="line-74"></span>
+<span class="source-line-no">075</span><span id="line-75"> @BeforeAll</span>
+<span class="source-line-no">076</span><span id="line-76"> public static void setUp() throws Exception {</span>
+<span class="source-line-no">077</span><span id="line-77"> HBaseTestingUtil util = new HBaseTestingUtil();</span>
+<span class="source-line-no">078</span><span id="line-78"></span>
+<span class="source-line-no">079</span><span id="line-79"> util.startMiniCluster(1);</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81"> Admin admin = util.getAdmin();</span>
+<span class="source-line-no">082</span><span id="line-82"> destroy(admin, HBASE_TABLE_NAME);</span>
+<span class="source-line-no">083</span><span id="line-83"> create(admin, HBASE_TABLE_NAME, FAMILY_A, FAMILY_B);</span>
+<span class="source-line-no">084</span><span id="line-84"> admin.close();</span>
+<span class="source-line-no">085</span><span id="line-85"> htable = util.getConnection().getTable(HBASE_TABLE_NAME);</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87"> /* Add some values */</span>
+<span class="source-line-no">088</span><span id="line-88"> List<Put> puts = new ArrayList<>();</span>
+<span class="source-line-no">089</span><span id="line-89"></span>
+<span class="source-line-no">090</span><span id="line-90"> /* Add a row with 'a:foo' = false */</span>
+<span class="source-line-no">091</span><span id="line-91"> Put put = new Put(Bytes.toBytes("1"));</span>
+<span class="source-line-no">092</span><span id="line-92"> put.setDurability(Durability.SKIP_WAL);</span>
+<span class="source-line-no">093</span><span id="line-93"> put.addColumn(FAMILY_A, QUALIFIER_FOO, Bytes.toBytes("false"));</span>
+<span class="source-line-no">094</span><span id="line-94"> put.addColumn(FAMILY_A, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">095</span><span id="line-95"> put.addColumn(FAMILY_B, QUALIFIER_FOO, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">096</span><span id="line-96"> put.addColumn(FAMILY_B, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">097</span><span id="line-97"> puts.add(put);</span>
+<span class="source-line-no">098</span><span id="line-98"></span>
+<span class="source-line-no">099</span><span id="line-99"> /* Add a row with 'a:foo' = true */</span>
+<span class="source-line-no">100</span><span id="line-100"> put = new Put(Bytes.toBytes("2"));</span>
+<span class="source-line-no">101</span><span id="line-101"> put.setDurability(Durability.SKIP_WAL);</span>
+<span class="source-line-no">102</span><span id="line-102"> put.addColumn(FAMILY_A, QUALIFIER_FOO, Bytes.toBytes("true"));</span>
+<span class="source-line-no">103</span><span id="line-103"> put.addColumn(FAMILY_A, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">104</span><span id="line-104"> put.addColumn(FAMILY_B, QUALIFIER_FOO, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">105</span><span id="line-105"> put.addColumn(FAMILY_B, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">106</span><span id="line-106"> puts.add(put);</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108"> /* Add a row with 'a:foo' qualifier not set */</span>
+<span class="source-line-no">109</span><span id="line-109"> put = new Put(Bytes.toBytes("3"));</span>
+<span class="source-line-no">110</span><span id="line-110"> put.setDurability(Durability.SKIP_WAL);</span>
+<span class="source-line-no">111</span><span id="line-111"> put.addColumn(FAMILY_A, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">112</span><span id="line-112"> put.addColumn(FAMILY_B, QUALIFIER_FOO, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">113</span><span id="line-113"> put.addColumn(FAMILY_B, QUALIFIER_BAR, Bytes.toBytes("_flag_"));</span>
+<span class="source-line-no">114</span><span id="line-114"> puts.add(put);</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116"> htable.put(puts);</span>
+<span class="source-line-no">117</span><span id="line-117"> /*</span>
+<span class="source-line-no">118</span><span id="line-118"> * We want to filter out from the scan all rows that do not have the column 'a:foo' with value</span>
+<span class="source-line-no">119</span><span id="line-119"> * 'false'. Only row with key '1' should be returned in the scan.</span>
+<span class="source-line-no">120</span><span id="line-120"> */</span>
+<span class="source-line-no">121</span><span id="line-121"> scanFilter = new SingleColumnValueFilter(FAMILY_A, QUALIFIER_FOO, CompareOperator.EQUAL,</span>
+<span class="source-line-no">122</span><span id="line-122"> new BinaryComparator(Bytes.toBytes("false")));</span>
+<span class="source-line-no">123</span><span id="line-123"> ((SingleColumnValueFilter) scanFilter).setFilterIfMissing(true);</span>
+<span class="source-line-no">124</span><span id="line-124"> }</span>
+<span class="source-line-no">125</span><span id="line-125"></span>
+<span class="source-line-no">126</span><span id="line-126"> @AfterAll</span>
+<span class="source-line-no">127</span><span id="line-127"> public static void tearDown() throws Exception {</span>
+<span class="source-line-no">128</span><span id="line-128"> htable.close();</span>
<span class="source-line-no">129</span><span id="line-129"> }</span>
<span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131"> @AfterClass</span>
-<span class="source-line-no">132</span><span id="line-132"> public static void tearDown() throws Exception {</span>
-<span class="source-line-no">133</span><span id="line-133"> htable.close();</span>
-<span class="source-line-no">134</span><span id="line-134"> }</span>
-<span class="source-line-no">135</span><span id="line-135"></span>
-<span class="source-line-no">136</span><span id="line-136"> private void verify(Scan scan) throws IOException {</span>
-<span class="source-line-no">137</span><span id="line-137"> ResultScanner scanner = htable.getScanner(scan);</span>
-<span class="source-line-no">138</span><span id="line-138"> Iterator<Result> it = scanner.iterator();</span>
-<span class="source-line-no">139</span><span id="line-139"></span>
-<span class="source-line-no">140</span><span id="line-140"> /* Then */</span>
-<span class="source-line-no">141</span><span id="line-141"> int count = 0;</span>
-<span class="source-line-no">142</span><span id="line-142"> try {</span>
-<span class="source-line-no">143</span><span id="line-143"> while (it.hasNext()) {</span>
-<span class="source-line-no">144</span><span id="line-144"> it.next();</span>
-<span class="source-line-no">145</span><span id="line-145"> count++;</span>
-<span class="source-line-no">146</span><span id="line-146"> }</span>
-<span class="source-line-no">147</span><span id="line-147"> } finally {</span>
-<span class="source-line-no">148</span><span id="line-148"> scanner.close();</span>
-<span class="source-line-no">149</span><span id="line-149"> }</span>
-<span class="source-line-no">150</span><span id="line-150"> assertEquals(expected, count);</span>
-<span class="source-line-no">151</span><span id="line-151"> }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> /**</span>
-<span class="source-line-no">154</span><span id="line-154"> * Test the filter by adding all columns of family A in the scan. (OK)</span>
-<span class="source-line-no">155</span><span id="line-155"> */</span>
-<span class="source-line-no">156</span><span id="line-156"> @Test</span>
-<span class="source-line-no">157</span><span id="line-157"> public void scanWithAllQualifiersOfFamiliyA() throws IOException {</span>
-<span class="source-line-no">158</span><span id="line-158"> /* Given */</span>
-<span class="source-line-no">159</span><span id="line-159"> Scan scan = new Scan();</span>
-<span class="source-line-no">160</span><span id="line-160"> scan.addFamily(FAMILY_A);</span>
-<span class="source-line-no">161</span><span id="line-161"> scan.setFilter(scanFilter);</span>
-<span class="source-line-no">162</span><span id="line-162"></span>
-<span class="source-line-no">163</span><span id="line-163"> verify(scan);</span>
-<span class="source-line-no">164</span><span id="line-164"> }</span>
-<span class="source-line-no">165</span><span id="line-165"></span>
-<span class="source-line-no">166</span><span id="line-166"> /**</span>
-<span class="source-line-no">167</span><span id="line-167"> * Test the filter by adding all columns of family A and B in the scan. (KO: row '3' without</span>
-<span class="source-line-no">168</span><span id="line-168"> * 'a:foo' qualifier is returned)</span>
-<span class="source-line-no">169</span><span id="line-169"> */</span>
-<span class="source-line-no">170</span><span id="line-170"> @Test</span>
-<span class="source-line-no">171</span><span id="line-171"> public void scanWithAllQualifiersOfBothFamilies() throws IOException {</span>
-<span class="source-line-no">172</span><span id="line-172"> /* When */</span>
-<span class="source-line-no">173</span><span id="line-173"> Scan scan = new Scan();</span>
-<span class="source-line-no">174</span><span id="line-174"> scan.setFilter(scanFilter);</span>
-<span class="source-line-no">175</span><span id="line-175"></span>
-<span class="source-line-no">176</span><span id="line-176"> verify(scan);</span>
-<span class="source-line-no">177</span><span id="line-177"> }</span>
-<span class="source-line-no">178</span><span id="line-178"></span>
-<span class="source-line-no">179</span><span id="line-179"> /**</span>
-<span class="source-line-no">180</span><span id="line-180"> * Test the filter by adding 2 columns of family A and 1 column of family B in the scan. (KO: row</span>
-<span class="source-line-no">181</span><span id="line-181"> * '3' without 'a:foo' qualifier is returned)</span>
-<span class="source-line-no">182</span><span id="line-182"> */</span>
-<span class="source-line-no">183</span><span id="line-183"> @Test</span>
-<span class="source-line-no">184</span><span id="line-184"> public void scanWithSpecificQualifiers1() throws IOException {</span>
-<span class="source-line-no">185</span><span id="line-185"> /* When */</span>
-<span class="source-line-no">186</span><span id="line-186"> Scan scan = new Scan();</span>
-<span class="source-line-no">187</span><span id="line-187"> scan.addColumn(FAMILY_A, QUALIFIER_FOO);</span>
-<span class="source-line-no">188</span><span id="line-188"> scan.addColumn(FAMILY_A, QUALIFIER_BAR);</span>
-<span class="source-line-no">189</span><span id="line-189"> scan.addColumn(FAMILY_B, QUALIFIER_BAR);</span>
-<span class="source-line-no">190</span><span id="line-190"> scan.addColumn(FAMILY_B, QUALIFIER_FOO);</span>
-<span class="source-line-no">191</span><span id="line-191"> scan.setFilter(scanFilter);</span>
-<span class="source-line-no">192</span><span id="line-192"></span>
-<span class="source-line-no">193</span><span id="line-193"> verify(scan);</span>
-<span class="source-line-no">194</span><span id="line-194"> }</span>
-<span class="source-line-no">195</span><span id="line-195"></span>
-<span class="source-line-no">196</span><span id="line-196"> /**</span>
-<span class="source-line-no">197</span><span id="line-197"> * Test the filter by adding 1 column of family A (the one used in the filter) and 1 column of</span>
-<span class="source-line-no">198</span><span id="line-198"> * family B in the scan. (OK)</span>
-<span class="source-line-no">199</span><span id="line-199"> */</span>
-<span class="source-line-no">200</span><span id="line-200"> @Test</span>
-<span class="source-line-no">201</span><span id="line-201"> public void scanWithSpecificQualifiers2() throws IOException {</span>
-<span class="source-line-no">202</span><span id="line-202"> /* When */</span>
-<span class="source-line-no">203</span><span id="line-203"> Scan scan = new Scan();</span>
-<span class="source-line-no">204</span><span id="line-204"> scan.addColumn(FAMILY_A, QUALIFIER_FOO);</span>
-<span class="source-line-no">205</span><span id="line-205"> scan.addColumn(FAMILY_B, QUALIFIER_BAR);</span>
-<span class="source-line-no">206</span><span id="line-206"> scan.setFilter(scanFilter);</span>
-<span class="source-line-no">207</span><span id="line-207"></span>
-<span class="source-line-no">208</span><span id="line-208"> verify(scan);</span>
-<span class="source-line-no">209</span><span id="line-209"> }</span>
-<span class="source-line-no">210</span><span id="line-210"></span>
-<span class="source-line-no">211</span><span id="line-211"> /**</span>
-<span class="source-line-no">212</span><span id="line-212"> * Test the filter by adding 2 columns of family A in the scan. (OK)</span>
-<span class="source-line-no">213</span><span id="line-213"> */</span>
-<span class="source-line-no">214</span><span id="line-214"> @Test</span>
-<span class="source-line-no">215</span><span id="line-215"> public void scanWithSpecificQualifiers3() throws IOException {</span>
-<span class="source-line-no">216</span><span id="line-216"> /* When */</span>
-<span class="source-line-no">217</span><span id="line-217"> Scan scan = new Scan();</span>
-<span class="source-line-no">218</span><span id="line-218"> scan.addColumn(FAMILY_A, QUALIFIER_FOO);</span>
-<span class="source-line-no">219</span><span id="line-219"> scan.addColumn(FAMILY_A, QUALIFIER_BAR);</span>
-<span class="source-line-no">220</span><span id="line-220"> scan.setFilter(scanFilter);</span>
-<span class="source-line-no">221</span><span id="line-221"></span>
-<span class="source-line-no">222</span><span id="line-222"> verify(scan);</span>
-<span class="source-line-no">223</span><span id="line-223"> }</span>
-<span class="source-line-no">224</span><span id="line-224"></span>
-<span class="source-line-no">225</span><span id="line-225"> private static void create(Admin admin, TableName tableName, byte[]... families)</span>
-<span class="source-line-no">226</span><span id="line-226"> throws IOException {</span>
-<span class="source-line-no">227</span><span id="line-227"> TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);</span>
-<span class="source-line-no">228</span><span id="line-228"> for (byte[] family : families) {</span>
-<span class="source-line-no">229</span><span id="line-229"> ColumnFamilyDescriptor familyDescriptor = ColumnFamilyDescriptorBuilder.newBuilder(family)</span>
-<span class="source-line-no">230</span><span id="line-230"> .setMaxVersions(1).setCompressionType(Algorithm.GZ).build();</span>
-<span class="source-line-no">231</span><span id="line-231"> builder.setColumnFamily(familyDescriptor);</span>
+<span class="source-line-no">131</span><span id="line-131"> private void verify(Scan scan) throws IOException {</span>
+<span class="source-line-no">132</span><span id="line-132"> ResultScanner scanner = htable.getScanner(scan);</span>
+<span class="source-line-no">133</span><span id="line-133"> Iterator<Result> it = scanner.iterator();</span>
+<span class="source-line-no">134</span><span id="line-134"></span>
+<span class="source-line-no">135</span><span id="line-135"> /* Then */</span>
+<span class="source-line-no">136</span><span id="line-136"> int count = 0;</span>
+<span class="source-line-no">137</span><span id="line-137"> try {</span>
+<span class="source-line-no">138</span><span id="line-138"> while (it.hasNext()) {</span>
+<span class="source-line-no">139</span><span id="line-139"> it.next();</span>
+<span class="source-line-no">140</span><span id="line-140"> count++;</span>
+<span class="source-line-no">141</span><span id="line-141"> }</span>
+<span class="source-line-no">142</span><span id="line-142"> } finally {</span>
+<span class="source-line-no">143</span><span id="line-143"> scanner.close();</span>
+<span class="source-line-no">144</span><span id="line-144"> }</span>
+<span class="source-line-no">145</span><span id="line-145"> assertEquals(expected, count);</span>
+<span class="source-line-no">146</span><span id="line-146"> }</span>
+<span class="source-line-no">147</span><span id="line-147"></span>
+<span class="source-line-no">148</span><span id="line-148"> /**</span>
+<span class="source-line-no">149</span><span id="line-149"> * Test the filter by adding all columns of family A in the scan. (OK)</span>
+<span class="source-line-no">150</span><span id="line-150"> */</span>
+<span class="source-line-no">151</span><span id="line-151"> @Test</span>
+<span class="source-line-no">152</span><span id="line-152"> public void scanWithAllQualifiersOfFamiliyA() throws IOException {</span>
+<span class="source-line-no">153</span><span id="line-153"> /* Given */</span>
+<span class="source-line-no">154</span><span id="line-154"> Scan scan = new Scan();</span>
+<span class="source-line-no">155</span><span id="line-155"> scan.addFamily(FAMILY_A);</span>
+<span class="source-line-no">156</span><span id="line-156"> scan.setFilter(scanFilter);</span>
+<span class="source-line-no">157</span><span id="line-157"></span>
+<span class="source-line-no">158</span><span id="line-158"> verify(scan);</span>
+<span class="source-line-no">159</span><span id="line-159"> }</span>
+<span class="source-line-no">160</span><span id="line-160"></span>
+<span class="source-line-no">161</span><span id="line-161"> /**</span>
+<span class="source-line-no">162</span><span id="line-162"> * Test the filter by adding all columns of family A and B in the scan. (KO: row '3' without</span>
+<span class="source-line-no">163</span><span id="line-163"> * 'a:foo' qualifier is returned)</span>
+<span class="source-line-no">164</span><span id="line-164"> */</span>
+<span class="source-line-no">165</span><span id="line-165"> @Test</span>
+<span class="source-line-no">166</span><span id="line-166"> public void scanWithAllQualifiersOfBothFamilies() throws IOException {</span>
+<span class="source-line-no">167</span><span id="line-167"> /* When */</span>
+<span class="source-line-no">168</span><span id="line-168"> Scan scan = new Scan();</span>
+<span class="source-line-no">169</span><span id="line-169"> scan.setFilter(scanFilter);</span>
+<span class="source-line-no">170</span><span id="line-170"></span>
+<span class="source-line-no">171</span><span id="line-171"> verify(scan);</span>
+<span class="source-line-no">172</span><span id="line-172"> }</span>
+<span class="source-line-no">173</span><span id="line-173"></span>
+<span class="source-line-no">174</span><span id="line-174"> /**</span>
+<span class="source-line-no">175</span><span id="line-175"> * Test the filter by adding 2 columns of family A and 1 column of family B in the scan. (KO: row</span>
+<span class="source-line-no">176</span><span id="line-176"> * '3' without 'a:foo' qualifier is returned)</span>
+<span class="source-line-no">177</span><span id="line-177"> */</span>
+<span class="source-line-no">178</span><span id="line-178"> @Test</span>
+<span class="source-line-no">179</span><span id="line-179"> public void scanWithSpecificQualifiers1() throws IOException {</span>
+<span class="source-line-no">180</span><span id="line-180"> /* When */</span>
+<span class="source-line-no">181</span><span id="line-181"> Scan scan = new Scan();</span>
+<span class="source-line-no">182</span><span id="line-182"> scan.addColumn(FAMILY_A, QUALIFIER_FOO);</span>
+<span class="source-line-no">183</span><span id="line-183"> scan.addColumn(FAMILY_A, QUALIFIER_BAR);</span>
+<span class="source-line-no">184</span><span id="line-184"> scan.addColumn(FAMILY_B, QUALIFIER_BAR);</span>
+<span class="source-line-no">185</span><span id="line-185"> scan.addColumn(FAMILY_B, QUALIFIER_FOO);</span>
+<span class="source-line-no">186</span><span id="line-186"> scan.setFilter(scanFilter);</span>
+<span class="source-line-no">187</span><span id="line-187"></span>
+<span class="source-line-no">188</span><span id="line-188"> verify(scan);</span>
+<span class="source-line-no">189</span><span id="line-189"> }</span>
+<span class="source-line-no">190</span><span id="line-190"></span>
+<span class="source-line-no">191</span><span id="line-191"> /**</span>
+<span class="source-line-no">192</span><span id="line-192"> * Test the filter by adding 1 column of family A (the one used in the filter) and 1 column of</span>
+<span class="source-line-no">193</span><span id="line-193"> * family B in the scan. (OK)</span>
+<span class="source-line-no">194</span><span id="line-194"> */</span>
+<span class="source-line-no">195</span><span id="line-195"> @Test</span>
+<span class="source-line-no">196</span><span id="line-196"> public void scanWithSpecificQualifiers2() throws IOException {</span>
+<span class="source-line-no">197</span><span id="line-197"> /* When */</span>
+<span class="source-line-no">198</span><span id="line-198"> Scan scan = new Scan();</span>
+<span class="source-line-no">199</span><span id="line-199"> scan.addColumn(FAMILY_A, QUALIFIER_FOO);</span>
+<span class="source-line-no">200</span><span id="line-200"> scan.addColumn(FAMILY_B, QUALIFIER_BAR);</span>
+<span class="source-line-no">201</span><span id="line-201"> scan.setFilter(scanFilter);</span>
+<span class="source-line-no">202</span><span id="line-202"></span>
+<span class="source-line-no">203</span><span id="line-203"> verify(scan);</span>
+<span class="source-line-no">204</span><span id="line-204"> }</span>
+<span class="source-line-no">205</span><span id="line-205"></span>
+<span class="source-line-no">206</span><span id="line-206"> /**</span>
+<span class="source-line-no">207</span><span id="line-207"> * Test the filter by adding 2 columns of family A in the scan. (OK)</span>
+<span class="source-line-no">208</span><span id="line-208"> */</span>
+<span class="source-line-no">209</span><span id="line-209"> @Test</span>
+<span class="source-line-no">210</span><span id="line-210"> public void scanWithSpecificQualifiers3() throws IOException {</span>
+<span class="source-line-no">211</span><span id="line-211"> /* When */</span>
+<span class="source-line-no">212</span><span id="line-212"> Scan scan = new Scan();</span>
+<span class="source-line-no">213</span><span id="line-213"> scan.addColumn(FAMILY_A, QUALIFIER_FOO);</span>
+<span class="source-line-no">214</span><span id="line-214"> scan.addColumn(FAMILY_A, QUALIFIER_BAR);</span>
+<span class="source-line-no">215</span><span id="line-215"> scan.setFilter(scanFilter);</span>
+<span class="source-line-no">216</span><span id="line-216"></span>
+<span class="source-line-no">217</span><span id="line-217"> verify(scan);</span>
+<span class="source-line-no">218</span><span id="line-218"> }</span>
+<span class="source-line-no">219</span><span id="line-219"></span>
+<span class="source-line-no">220</span><span id="line-220"> private static void create(Admin admin, TableName tableName, byte[]... families)</span>
+<span class="source-line-no">221</span><span id="line-221"> throws IOException {</span>
+<span class="source-line-no">222</span><span id="line-222"> TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);</span>
+<span class="source-line-no">223</span><span id="line-223"> for (byte[] family : families) {</span>
+<span class="source-line-no">224</span><span id="line-224"> ColumnFamilyDescriptor familyDescriptor = ColumnFamilyDescriptorBuilder.newBuilder(family)</span>
+<span class="source-line-no">225</span><span id="line-225"> .setMaxVersions(1).setCompressionType(Algorithm.GZ).build();</span>
+<span class="source-line-no">226</span><span id="line-226"> builder.setColumnFamily(familyDescriptor);</span>
+<span class="source-line-no">227</span><span id="line-227"> }</span>
+<span class="source-line-no">228</span><span id="line-228"> try {</span>
+<span class="source-line-no">229</span><span id="line-229"> admin.createTable(builder.build());</span>
+<span class="source-line-no">230</span><span id="line-230"> } catch (TableExistsException tee) {</span>
+<span class="source-line-no">231</span><span id="line-231"> /* Ignore */</span>
<span class="source-line-no">232</span><span id="line-232"> }</span>
-<span class="source-line-no">233</span><span id="line-233"> try {</span>
-<span class="source-line-no">234</span><span id="line-234"> admin.createTable(builder.build());</span>
-<span class="source-line-no">235</span><span id="line-235"> } catch (TableExistsException tee) {</span>
-<span class="source-line-no">236</span><span id="line-236"> /* Ignore */</span>
-<span class="source-line-no">237</span><span id="line-237"> }</span>
-<span class="source-line-no">238</span><span id="line-238"> }</span>
-<span class="source-line-no">239</span><span id="line-239"></span>
-<span class="source-line-no">240</span><span id="line-240"> private static void destroy(Admin admin, TableName tableName) throws IOException {</span>
-<span class="source-line-no">241</span><span id="line-241"> try {</span>
-<span class="source-line-no">242</span><span id="line-242"> admin.disableTable(tableName);</span>
-<span class="source-line-no">243</span><span id="line-243"> admin.deleteTable(tableName);</span>
-<span class="source-line-no">244</span><span id="line-244"> } catch (TableNotFoundException tnfe) {</span>
-<span class="source-line-no">245</span><span id="line-245"> /* Ignore */</span>
-<span class="source-line-no">246</span><span id="line-246"> }</span>
-<span class="source-line-no">247</span><span id="line-247"> }</span>
-<span class="source-line-no">248</span><span id="line-248">}</span>
+<span class="source-line-no">233</span><span id="line-233"> }</span>
+<span class="source-line-no">234</span><span id="line-234"></span>
+<span class="source-line-no">235</span><span id="line-235"> private static void destroy(Admin admin, TableName tableName) throws IOException {</span>
+<span class="source-line-no">236</span><span id="line-236"> try {</span>
+<span class="source-line-no">237</span><span id="line-237"> admin.disableTable(tableName);</span>
+<span class="source-line-no">238</span><span id="line-238"> admin.deleteTable(tableName);</span>
+<span class="source-line-no">239</span><span id="line-239"> } catch (TableNotFoundException tnfe) {</span>
+<span class="source-line-no">240</span><span id="line-240"> /* Ignore */</span>
+<span class="source-line-no">241</span><span id="line-241"> }</span>
+<span class="source-line-no">242</span><span id="line-242"> }</span>
+<span class="source-line-no">243</span><span id="line-243">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html
index f418f733ac2..343c810d859 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.html
@@ -30,24 +30,24 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertTrue;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
<span class="source-line-no">022</span><span id="line-22"></span>
<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
<span class="source-line-no">024</span><span id="line-24">import java.util.ArrayList;</span>
<span class="source-line-no">025</span><span id="line-25">import java.util.Arrays;</span>
-<span class="source-line-no">026</span><span id="line-26">import java.util.Collection;</span>
-<span class="source-line-no">027</span><span id="line-27">import java.util.Collections;</span>
-<span class="source-line-no">028</span><span id="line-28">import java.util.Comparator;</span>
-<span class="source-line-no">029</span><span id="line-29">import java.util.List;</span>
-<span class="source-line-no">030</span><span id="line-30">import java.util.NavigableSet;</span>
-<span class="source-line-no">031</span><span id="line-31">import java.util.TreeSet;</span>
+<span class="source-line-no">026</span><span id="line-26">import java.util.Collections;</span>
+<span class="source-line-no">027</span><span id="line-27">import java.util.Comparator;</span>
+<span class="source-line-no">028</span><span id="line-28">import java.util.List;</span>
+<span class="source-line-no">029</span><span id="line-29">import java.util.NavigableSet;</span>
+<span class="source-line-no">030</span><span id="line-30">import java.util.TreeSet;</span>
+<span class="source-line-no">031</span><span id="line-31">import java.util.stream.Stream;</span>
<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.conf.Configuration;</span>
<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.fs.FileSystem;</span>
<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.fs.Path;</span>
<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.Cell;</span>
<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.CellUtil;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;</span>
<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.KeyValue;</span>
<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.KeyValueTestUtil;</span>
@@ -61,168 +61,161 @@
<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.testclassification.SmallTests;</span>
<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.util.BloomFilterUtil;</span>
<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.junit.Before;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.ClassRule;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.Test;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.junit.runner.RunWith;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.junit.runners.Parameterized;</span>
-<span class="source-line-no">057</span><span id="line-57">import org.junit.runners.Parameterized.Parameters;</span>
-<span class="source-line-no">058</span><span id="line-58">import org.slf4j.Logger;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61">/**</span>
-<span class="source-line-no">062</span><span id="line-62"> * Test a multi-column scanner when there is a Bloom filter false-positive. This is needed for the</span>
-<span class="source-line-no">063</span><span id="line-63"> * multi-column Bloom filter optimization.</span>
-<span class="source-line-no">064</span><span id="line-64"> */</span>
-<span class="source-line-no">065</span><span id="line-65">@RunWith(Parameterized.class)</span>
-<span class="source-line-no">066</span><span id="line-66">@Category({ RegionServerTests.class, SmallTests.class })</span>
-<span class="source-line-no">067</span><span id="line-67">public class TestScanWithBloomError {</span>
+<span class="source-line-no">051</span><span id="line-51">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">053</span><span id="line-53">import org.junit.jupiter.api.TestTemplate;</span>
+<span class="source-line-no">054</span><span id="line-54">import org.junit.jupiter.params.provider.Arguments;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.slf4j.Logger;</span>
+<span class="source-line-no">056</span><span id="line-56">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">057</span><span id="line-57"></span>
+<span class="source-line-no">058</span><span id="line-58">/**</span>
+<span class="source-line-no">059</span><span id="line-59"> * Test a multi-column scanner when there is a Bloom filter false-positive. This is needed for the</span>
+<span class="source-line-no">060</span><span id="line-60"> * multi-column Bloom filter optimization.</span>
+<span class="source-line-no">061</span><span id="line-61"> */</span>
+<span class="source-line-no">062</span><span id="line-62">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">063</span><span id="line-63">@Tag(SmallTests.TAG)</span>
+<span class="source-line-no">064</span><span id="line-64">@HBaseParameterizedTestTemplate(name = "{index}: bloomType={0}")</span>
+<span class="source-line-no">065</span><span id="line-65">public class TestScanWithBloomError {</span>
+<span class="source-line-no">066</span><span id="line-66"></span>
+<span class="source-line-no">067</span><span id="line-67"> private static final Logger LOG = LoggerFactory.getLogger(TestScanWithBloomError.class);</span>
<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69"> @ClassRule</span>
-<span class="source-line-no">070</span><span id="line-70"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">071</span><span id="line-71"> HBaseClassTestRule.forClass(TestScanWithBloomError.class);</span>
-<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73"> private static final Logger LOG = LoggerFactory.getLogger(TestScanWithBloomError.class);</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75"> private static final String TABLE_NAME = "ScanWithBloomError";</span>
-<span class="source-line-no">076</span><span id="line-76"> private static final String FAMILY = "myCF";</span>
-<span class="source-line-no">077</span><span id="line-77"> private static final byte[] FAMILY_BYTES = Bytes.toBytes(FAMILY);</span>
-<span class="source-line-no">078</span><span id="line-78"> private static final String ROW = "theRow";</span>
-<span class="source-line-no">079</span><span id="line-79"> private static final String QUALIFIER_PREFIX = "qual";</span>
-<span class="source-line-no">080</span><span id="line-80"> private static final byte[] ROW_BYTES = Bytes.toBytes(ROW);</span>
-<span class="source-line-no">081</span><span id="line-81"> private static NavigableSet<Integer> allColIds = new TreeSet<>();</span>
-<span class="source-line-no">082</span><span id="line-82"> private HRegion region;</span>
-<span class="source-line-no">083</span><span id="line-83"> private BloomType bloomType;</span>
-<span class="source-line-no">084</span><span id="line-84"> private FileSystem fs;</span>
-<span class="source-line-no">085</span><span id="line-85"> private Configuration conf;</span>
-<span class="source-line-no">086</span><span id="line-86"></span>
-<span class="source-line-no">087</span><span id="line-87"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">088</span><span id="line-88"></span>
-<span class="source-line-no">089</span><span id="line-89"> @Parameters</span>
-<span class="source-line-no">090</span><span id="line-90"> public static final Collection<Object[]> parameters() {</span>
-<span class="source-line-no">091</span><span id="line-91"> List<Object[]> configurations = new ArrayList<>();</span>
-<span class="source-line-no">092</span><span id="line-92"> for (BloomType bloomType : BloomType.values()) {</span>
-<span class="source-line-no">093</span><span id="line-93"> configurations.add(new Object[] { bloomType });</span>
-<span class="source-line-no">094</span><span id="line-94"> }</span>
-<span class="source-line-no">095</span><span id="line-95"> return configurations;</span>
-<span class="source-line-no">096</span><span id="line-96"> }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98"> public TestScanWithBloomError(BloomType bloomType) {</span>
-<span class="source-line-no">099</span><span id="line-99"> this.bloomType = bloomType;</span>
+<span class="source-line-no">069</span><span id="line-69"> private static final String TABLE_NAME = "ScanWithBloomError";</span>
+<span class="source-line-no">070</span><span id="line-70"> private static final String FAMILY = "myCF";</span>
+<span class="source-line-no">071</span><span id="line-71"> private static final byte[] FAMILY_BYTES = Bytes.toBytes(FAMILY);</span>
+<span class="source-line-no">072</span><span id="line-72"> private static final String ROW = "theRow";</span>
+<span class="source-line-no">073</span><span id="line-73"> private static final String QUALIFIER_PREFIX = "qual";</span>
+<span class="source-line-no">074</span><span id="line-74"> private static final byte[] ROW_BYTES = Bytes.toBytes(ROW);</span>
+<span class="source-line-no">075</span><span id="line-75"> private static NavigableSet<Integer> allColIds = new TreeSet<>();</span>
+<span class="source-line-no">076</span><span id="line-76"> private HRegion region;</span>
+<span class="source-line-no">077</span><span id="line-77"> private BloomType bloomType;</span>
+<span class="source-line-no">078</span><span id="line-78"> private FileSystem fs;</span>
+<span class="source-line-no">079</span><span id="line-79"> private Configuration conf;</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">082</span><span id="line-82"></span>
+<span class="source-line-no">083</span><span id="line-83"> public static final Stream<Arguments> parameters() {</span>
+<span class="source-line-no">084</span><span id="line-84"> List<Arguments> configurations = new ArrayList<>();</span>
+<span class="source-line-no">085</span><span id="line-85"> for (BloomType bloomType : BloomType.values()) {</span>
+<span class="source-line-no">086</span><span id="line-86"> configurations.add(Arguments.of(bloomType));</span>
+<span class="source-line-no">087</span><span id="line-87"> }</span>
+<span class="source-line-no">088</span><span id="line-88"> return configurations.stream();</span>
+<span class="source-line-no">089</span><span id="line-89"> }</span>
+<span class="source-line-no">090</span><span id="line-90"></span>
+<span class="source-line-no">091</span><span id="line-91"> public TestScanWithBloomError(BloomType bloomType) {</span>
+<span class="source-line-no">092</span><span id="line-92"> this.bloomType = bloomType;</span>
+<span class="source-line-no">093</span><span id="line-93"> }</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95"> @BeforeEach</span>
+<span class="source-line-no">096</span><span id="line-96"> public void setUp() throws IOException {</span>
+<span class="source-line-no">097</span><span id="line-97"> conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">098</span><span id="line-98"> fs = FileSystem.get(conf);</span>
+<span class="source-line-no">099</span><span id="line-99"> conf.setInt(BloomFilterUtil.PREFIX_LENGTH_KEY, 10);</span>
<span class="source-line-no">100</span><span id="line-100"> }</span>
<span class="source-line-no">101</span><span id="line-101"></span>
-<span class="source-line-no">102</span><span id="line-102"> @Before</span>
-<span class="source-line-no">103</span><span id="line-103"> public void setUp() throws IOException {</span>
-<span class="source-line-no">104</span><span id="line-104"> conf = TEST_UTIL.getConfiguration();</span>
-<span class="source-line-no">105</span><span id="line-105"> fs = FileSystem.get(conf);</span>
-<span class="source-line-no">106</span><span id="line-106"> conf.setInt(BloomFilterUtil.PREFIX_LENGTH_KEY, 10);</span>
-<span class="source-line-no">107</span><span id="line-107"> }</span>
-<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109"> @Test</span>
-<span class="source-line-no">110</span><span id="line-110"> public void testThreeStoreFiles() throws IOException {</span>
-<span class="source-line-no">111</span><span id="line-111"> ColumnFamilyDescriptor columnFamilyDescriptor = ColumnFamilyDescriptorBuilder</span>
-<span class="source-line-no">112</span><span id="line-112"> .newBuilder(Bytes.toBytes(FAMILY)).setCompressionType(Compression.Algorithm.GZ)</span>
-<span class="source-line-no">113</span><span id="line-113"> .setBloomFilterType(bloomType).setMaxVersions(TestMultiColumnScanner.MAX_VERSIONS).build();</span>
-<span class="source-line-no">114</span><span id="line-114"> region = TEST_UTIL.createTestRegion(TABLE_NAME, columnFamilyDescriptor);</span>
-<span class="source-line-no">115</span><span id="line-115"> createStoreFile(new int[] { 1, 2, 6 });</span>
-<span class="source-line-no">116</span><span id="line-116"> createStoreFile(new int[] { 1, 2, 3, 7 });</span>
-<span class="source-line-no">117</span><span id="line-117"> createStoreFile(new int[] { 1, 9 });</span>
-<span class="source-line-no">118</span><span id="line-118"> scanColSet(new int[] { 1, 4, 6, 7 }, new int[] { 1, 6, 7 });</span>
-<span class="source-line-no">119</span><span id="line-119"></span>
-<span class="source-line-no">120</span><span id="line-120"> HBaseTestingUtil.closeRegionAndWAL(region);</span>
-<span class="source-line-no">121</span><span id="line-121"> }</span>
-<span class="source-line-no">122</span><span id="line-122"></span>
-<span class="source-line-no">123</span><span id="line-123"> private void scanColSet(int[] colSet, int[] expectedResultCols) throws IOException {</span>
-<span class="source-line-no">124</span><span id="line-124"> LOG.info("Scanning column set: " + Arrays.toString(colSet));</span>
-<span class="source-line-no">125</span><span id="line-125"> Scan scan = new Scan().withStartRow(ROW_BYTES).withStopRow(ROW_BYTES, true);</span>
-<span class="source-line-no">126</span><span id="line-126"> addColumnSetToScan(scan, colSet);</span>
-<span class="source-line-no">127</span><span id="line-127"> RegionScannerImpl scanner = region.getScanner(scan);</span>
-<span class="source-line-no">128</span><span id="line-128"> KeyValueHeap storeHeap = scanner.storeHeap;</span>
-<span class="source-line-no">129</span><span id="line-129"> assertEquals(0, storeHeap.getHeap().size());</span>
-<span class="source-line-no">130</span><span id="line-130"> StoreScanner storeScanner = (StoreScanner) storeHeap.getCurrentForTesting();</span>
-<span class="source-line-no">131</span><span id="line-131"> @SuppressWarnings({ "unchecked", "rawtypes" })</span>
-<span class="source-line-no">132</span><span id="line-132"> List<StoreFileScanner> scanners =</span>
-<span class="source-line-no">133</span><span id="line-133"> (List<StoreFileScanner>) (List) storeScanner.getAllScannersForTesting();</span>
-<span class="source-line-no">134</span><span id="line-134"></span>
-<span class="source-line-no">135</span><span id="line-135"> // Sort scanners by their HFile's modification time.</span>
-<span class="source-line-no">136</span><span id="line-136"> Collections.sort(scanners, new Comparator<StoreFileScanner>() {</span>
-<span class="source-line-no">137</span><span id="line-137"> @Override</span>
-<span class="source-line-no">138</span><span id="line-138"> public int compare(StoreFileScanner s1, StoreFileScanner s2) {</span>
-<span class="source-line-no">139</span><span id="line-139"> Path p1 = s1.getReader().getHFileReader().getPath();</span>
-<span class="source-line-no">140</span><span id="line-140"> Path p2 = s2.getReader().getHFileReader().getPath();</span>
-<span class="source-line-no">141</span><span id="line-141"> long t1, t2;</span>
-<span class="source-line-no">142</span><span id="line-142"> try {</span>
-<span class="source-line-no">143</span><span id="line-143"> t1 = fs.getFileStatus(p1).getModificationTime();</span>
-<span class="source-line-no">144</span><span id="line-144"> t2 = fs.getFileStatus(p2).getModificationTime();</span>
-<span class="source-line-no">145</span><span id="line-145"> } catch (IOException ex) {</span>
-<span class="source-line-no">146</span><span id="line-146"> throw new RuntimeException(ex);</span>
-<span class="source-line-no">147</span><span id="line-147"> }</span>
-<span class="source-line-no">148</span><span id="line-148"> return t1 < t2 ? -1 : t1 == t2 ? 1 : 0;</span>
-<span class="source-line-no">149</span><span id="line-149"> }</span>
-<span class="source-line-no">150</span><span id="line-150"> });</span>
+<span class="source-line-no">102</span><span id="line-102"> @TestTemplate</span>
+<span class="source-line-no">103</span><span id="line-103"> public void testThreeStoreFiles() throws IOException {</span>
+<span class="source-line-no">104</span><span id="line-104"> ColumnFamilyDescriptor columnFamilyDescriptor = ColumnFamilyDescriptorBuilder</span>
+<span class="source-line-no">105</span><span id="line-105"> .newBuilder(Bytes.toBytes(FAMILY)).setCompressionType(Compression.Algorithm.GZ)</span>
+<span class="source-line-no">106</span><span id="line-106"> .setBloomFilterType(bloomType).setMaxVersions(TestMultiColumnScanner.MAX_VERSIONS).build();</span>
+<span class="source-line-no">107</span><span id="line-107"> region = TEST_UTIL.createTestRegion(TABLE_NAME, columnFamilyDescriptor);</span>
+<span class="source-line-no">108</span><span id="line-108"> createStoreFile(new int[] { 1, 2, 6 });</span>
+<span class="source-line-no">109</span><span id="line-109"> createStoreFile(new int[] { 1, 2, 3, 7 });</span>
+<span class="source-line-no">110</span><span id="line-110"> createStoreFile(new int[] { 1, 9 });</span>
+<span class="source-line-no">111</span><span id="line-111"> scanColSet(new int[] { 1, 4, 6, 7 }, new int[] { 1, 6, 7 });</span>
+<span class="source-line-no">112</span><span id="line-112"></span>
+<span class="source-line-no">113</span><span id="line-113"> HBaseTestingUtil.closeRegionAndWAL(region);</span>
+<span class="source-line-no">114</span><span id="line-114"> }</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116"> private void scanColSet(int[] colSet, int[] expectedResultCols) throws IOException {</span>
+<span class="source-line-no">117</span><span id="line-117"> LOG.info("Scanning column set: " + Arrays.toString(colSet));</span>
+<span class="source-line-no">118</span><span id="line-118"> Scan scan = new Scan().withStartRow(ROW_BYTES).withStopRow(ROW_BYTES, true);</span>
+<span class="source-line-no">119</span><span id="line-119"> addColumnSetToScan(scan, colSet);</span>
+<span class="source-line-no">120</span><span id="line-120"> RegionScannerImpl scanner = region.getScanner(scan);</span>
+<span class="source-line-no">121</span><span id="line-121"> KeyValueHeap storeHeap = scanner.storeHeap;</span>
+<span class="source-line-no">122</span><span id="line-122"> assertEquals(0, storeHeap.getHeap().size());</span>
+<span class="source-line-no">123</span><span id="line-123"> StoreScanner storeScanner = (StoreScanner) storeHeap.getCurrentForTesting();</span>
+<span class="source-line-no">124</span><span id="line-124"> @SuppressWarnings({ "unchecked", "rawtypes" })</span>
+<span class="source-line-no">125</span><span id="line-125"> List<StoreFileScanner> scanners =</span>
+<span class="source-line-no">126</span><span id="line-126"> (List<StoreFileScanner>) (List) storeScanner.getAllScannersForTesting();</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128"> // Sort scanners by their HFile's modification time.</span>
+<span class="source-line-no">129</span><span id="line-129"> Collections.sort(scanners, new Comparator<StoreFileScanner>() {</span>
+<span class="source-line-no">130</span><span id="line-130"> @Override</span>
+<span class="source-line-no">131</span><span id="line-131"> public int compare(StoreFileScanner s1, StoreFileScanner s2) {</span>
+<span class="source-line-no">132</span><span id="line-132"> Path p1 = s1.getReader().getHFileReader().getPath();</span>
+<span class="source-line-no">133</span><span id="line-133"> Path p2 = s2.getReader().getHFileReader().getPath();</span>
+<span class="source-line-no">134</span><span id="line-134"> long t1, t2;</span>
+<span class="source-line-no">135</span><span id="line-135"> try {</span>
+<span class="source-line-no">136</span><span id="line-136"> t1 = fs.getFileStatus(p1).getModificationTime();</span>
+<span class="source-line-no">137</span><span id="line-137"> t2 = fs.getFileStatus(p2).getModificationTime();</span>
+<span class="source-line-no">138</span><span id="line-138"> } catch (IOException ex) {</span>
+<span class="source-line-no">139</span><span id="line-139"> throw new RuntimeException(ex);</span>
+<span class="source-line-no">140</span><span id="line-140"> }</span>
+<span class="source-line-no">141</span><span id="line-141"> return t1 < t2 ? -1 : t1 == t2 ? 1 : 0;</span>
+<span class="source-line-no">142</span><span id="line-142"> }</span>
+<span class="source-line-no">143</span><span id="line-143"> });</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145"> StoreFileReader lastStoreFileReader = null;</span>
+<span class="source-line-no">146</span><span id="line-146"> for (StoreFileScanner sfScanner : scanners)</span>
+<span class="source-line-no">147</span><span id="line-147"> lastStoreFileReader = sfScanner.getReader();</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149"> new HFilePrettyPrinter(conf).run(</span>
+<span class="source-line-no">150</span><span id="line-150"> new String[] { "-m", "-p", "-f", lastStoreFileReader.getHFileReader().getPath().toString() });</span>
<span class="source-line-no">151</span><span id="line-151"></span>
-<span class="source-line-no">152</span><span id="line-152"> StoreFileReader lastStoreFileReader = null;</span>
-<span class="source-line-no">153</span><span id="line-153"> for (StoreFileScanner sfScanner : scanners)</span>
-<span class="source-line-no">154</span><span id="line-154"> lastStoreFileReader = sfScanner.getReader();</span>
-<span class="source-line-no">155</span><span id="line-155"></span>
-<span class="source-line-no">156</span><span id="line-156"> new HFilePrettyPrinter(conf).run(</span>
-<span class="source-line-no">157</span><span id="line-157"> new String[] { "-m", "-p", "-f", lastStoreFileReader.getHFileReader().getPath().toString() });</span>
+<span class="source-line-no">152</span><span id="line-152"> // Disable Bloom filter for the last store file. The disabled Bloom filter</span>
+<span class="source-line-no">153</span><span id="line-153"> // will always return "true".</span>
+<span class="source-line-no">154</span><span id="line-154"> LOG.info("Disabling Bloom filter for: " + lastStoreFileReader.getHFileReader().getName());</span>
+<span class="source-line-no">155</span><span id="line-155"> lastStoreFileReader.disableBloomFilterForTesting();</span>
+<span class="source-line-no">156</span><span id="line-156"></span>
+<span class="source-line-no">157</span><span id="line-157"> List<Cell> allResults = new ArrayList<>();</span>
<span class="source-line-no">158</span><span id="line-158"></span>
-<span class="source-line-no">159</span><span id="line-159"> // Disable Bloom filter for the last store file. The disabled Bloom filter</span>
-<span class="source-line-no">160</span><span id="line-160"> // will always return "true".</span>
-<span class="source-line-no">161</span><span id="line-161"> LOG.info("Disabling Bloom filter for: " + lastStoreFileReader.getHFileReader().getName());</span>
-<span class="source-line-no">162</span><span id="line-162"> lastStoreFileReader.disableBloomFilterForTesting();</span>
-<span class="source-line-no">163</span><span id="line-163"></span>
-<span class="source-line-no">164</span><span id="line-164"> List<Cell> allResults = new ArrayList<>();</span>
-<span class="source-line-no">165</span><span id="line-165"></span>
-<span class="source-line-no">166</span><span id="line-166"> { // Limit the scope of results.</span>
-<span class="source-line-no">167</span><span id="line-167"> List<Cell> results = new ArrayList<>();</span>
-<span class="source-line-no">168</span><span id="line-168"> while (scanner.next(results) || results.size() > 0) {</span>
-<span class="source-line-no">169</span><span id="line-169"> allResults.addAll(results);</span>
-<span class="source-line-no">170</span><span id="line-170"> results.clear();</span>
-<span class="source-line-no">171</span><span id="line-171"> }</span>
+<span class="source-line-no">159</span><span id="line-159"> { // Limit the scope of results.</span>
+<span class="source-line-no">160</span><span id="line-160"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">161</span><span id="line-161"> while (scanner.next(results) || results.size() > 0) {</span>
+<span class="source-line-no">162</span><span id="line-162"> allResults.addAll(results);</span>
+<span class="source-line-no">163</span><span id="line-163"> results.clear();</span>
+<span class="source-line-no">164</span><span id="line-164"> }</span>
+<span class="source-line-no">165</span><span id="line-165"> }</span>
+<span class="source-line-no">166</span><span id="line-166"></span>
+<span class="source-line-no">167</span><span id="line-167"> List<Integer> actualIds = new ArrayList<>();</span>
+<span class="source-line-no">168</span><span id="line-168"> for (Cell kv : allResults) {</span>
+<span class="source-line-no">169</span><span id="line-169"> String qual = Bytes.toString(CellUtil.cloneQualifier(kv));</span>
+<span class="source-line-no">170</span><span id="line-170"> assertTrue(qual.startsWith(QUALIFIER_PREFIX));</span>
+<span class="source-line-no">171</span><span id="line-171"> actualIds.add(Integer.valueOf(qual.substring(QUALIFIER_PREFIX.length())));</span>
<span class="source-line-no">172</span><span id="line-172"> }</span>
-<span class="source-line-no">173</span><span id="line-173"></span>
-<span class="source-line-no">174</span><span id="line-174"> List<Integer> actualIds = new ArrayList<>();</span>
-<span class="source-line-no">175</span><span id="line-175"> for (Cell kv : allResults) {</span>
-<span class="source-line-no">176</span><span id="line-176"> String qual = Bytes.toString(CellUtil.cloneQualifier(kv));</span>
-<span class="source-line-no">177</span><span id="line-177"> assertTrue(qual.startsWith(QUALIFIER_PREFIX));</span>
-<span class="source-line-no">178</span><span id="line-178"> actualIds.add(Integer.valueOf(qual.substring(QUALIFIER_PREFIX.length())));</span>
-<span class="source-line-no">179</span><span id="line-179"> }</span>
-<span class="source-line-no">180</span><span id="line-180"> List<Integer> expectedIds = new ArrayList<>();</span>
-<span class="source-line-no">181</span><span id="line-181"> for (int expectedId : expectedResultCols)</span>
-<span class="source-line-no">182</span><span id="line-182"> expectedIds.add(expectedId);</span>
-<span class="source-line-no">183</span><span id="line-183"></span>
-<span class="source-line-no">184</span><span id="line-184"> LOG.info("Column ids returned: " + actualIds + ", expected: " + expectedIds);</span>
-<span class="source-line-no">185</span><span id="line-185"> assertEquals(expectedIds.toString(), actualIds.toString());</span>
-<span class="source-line-no">186</span><span id="line-186"> }</span>
-<span class="source-line-no">187</span><span id="line-187"></span>
-<span class="source-line-no">188</span><span id="line-188"> private void addColumnSetToScan(Scan scan, int[] colIds) {</span>
-<span class="source-line-no">189</span><span id="line-189"> for (int colId : colIds) {</span>
-<span class="source-line-no">190</span><span id="line-190"> scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qualFromId(colId)));</span>
-<span class="source-line-no">191</span><span id="line-191"> }</span>
-<span class="source-line-no">192</span><span id="line-192"> }</span>
-<span class="source-line-no">193</span><span id="line-193"></span>
-<span class="source-line-no">194</span><span id="line-194"> private String qualFromId(int colId) {</span>
-<span class="source-line-no">195</span><span id="line-195"> return QUALIFIER_PREFIX + colId;</span>
-<span class="source-line-no">196</span><span id="line-196"> }</span>
-<span class="source-line-no">197</span><span id="line-197"></span>
-<span class="source-line-no">198</span><span id="line-198"> private void createStoreFile(int[] colIds) throws IOException {</span>
-<span class="source-line-no">199</span><span id="line-199"> Put p = new Put(ROW_BYTES);</span>
-<span class="source-line-no">200</span><span id="line-200"> for (int colId : colIds) {</span>
-<span class="source-line-no">201</span><span id="line-201"> long ts = Long.MAX_VALUE;</span>
-<span class="source-line-no">202</span><span id="line-202"> String qual = qualFromId(colId);</span>
-<span class="source-line-no">203</span><span id="line-203"> allColIds.add(colId);</span>
-<span class="source-line-no">204</span><span id="line-204"> KeyValue kv = KeyValueTestUtil.create(ROW, FAMILY, qual, ts,</span>
-<span class="source-line-no">205</span><span id="line-205"> TestMultiColumnScanner.createValue(ROW, qual, ts));</span>
-<span class="source-line-no">206</span><span id="line-206"> p.add(kv);</span>
-<span class="source-line-no">207</span><span id="line-207"> }</span>
-<span class="source-line-no">208</span><span id="line-208"> region.put(p);</span>
-<span class="source-line-no">209</span><span id="line-209"> region.flush(true);</span>
-<span class="source-line-no">210</span><span id="line-210"> }</span>
-<span class="source-line-no">211</span><span id="line-211"></span>
-<span class="source-line-no">212</span><span id="line-212">}</span>
+<span class="source-line-no">173</span><span id="line-173"> List<Integer> expectedIds = new ArrayList<>();</span>
+<span class="source-line-no">174</span><span id="line-174"> for (int expectedId : expectedResultCols)</span>
+<span class="source-line-no">175</span><span id="line-175"> expectedIds.add(expectedId);</span>
+<span class="source-line-no">176</span><span id="line-176"></span>
+<span class="source-line-no">177</span><span id="line-177"> LOG.info("Column ids returned: " + actualIds + ", expected: " + expectedIds);</span>
+<span class="source-line-no">178</span><span id="line-178"> assertEquals(expectedIds.toString(), actualIds.toString());</span>
+<span class="source-line-no">179</span><span id="line-179"> }</span>
+<span class="source-line-no">180</span><span id="line-180"></span>
+<span class="source-line-no">181</span><span id="line-181"> private void addColumnSetToScan(Scan scan, int[] colIds) {</span>
+<span class="source-line-no">182</span><span id="line-182"> for (int colId : colIds) {</span>
+<span class="source-line-no">183</span><span id="line-183"> scan.addColumn(FAMILY_BYTES, Bytes.toBytes(qualFromId(colId)));</span>
+<span class="source-line-no">184</span><span id="line-184"> }</span>
+<span class="source-line-no">185</span><span id="line-185"> }</span>
+<span class="source-line-no">186</span><span id="line-186"></span>
+<span class="source-line-no">187</span><span id="line-187"> private String qualFromId(int colId) {</span>
+<span class="source-line-no">188</span><span id="line-188"> return QUALIFIER_PREFIX + colId;</span>
+<span class="source-line-no">189</span><span id="line-189"> }</span>
+<span class="source-line-no">190</span><span id="line-190"></span>
+<span class="source-line-no">191</span><span id="line-191"> private void createStoreFile(int[] colIds) throws IOException {</span>
+<span class="source-line-no">192</span><span id="line-192"> Put p = new Put(ROW_BYTES);</span>
+<span class="source-line-no">193</span><span id="line-193"> for (int colId : colIds) {</span>
+<span class="source-line-no">194</span><span id="line-194"> long ts = Long.MAX_VALUE;</span>
+<span class="source-line-no">195</span><span id="line-195"> String qual = qualFromId(colId);</span>
+<span class="source-line-no">196</span><span id="line-196"> allColIds.add(colId);</span>
+<span class="source-line-no">197</span><span id="line-197"> KeyValue kv = KeyValueTestUtil.create(ROW, FAMILY, qual, ts,</span>
+<span class="source-line-no">198</span><span id="line-198"> TestMultiColumnScanner.createValue(ROW, qual, ts));</span>
+<span class="source-line-no">199</span><span id="line-199"> p.add(kv);</span>
+<span class="source-line-no">200</span><span id="line-200"> }</span>
+<span class="source-line-no">201</span><span id="line-201"> region.put(p);</span>
+<span class="source-line-no">202</span><span id="line-202"> region.flush(true);</span>
+<span class="source-line-no">203</span><span id="line-203"> }</span>
+<span class="source-line-no">204</span><span id="line-204"></span>
+<span class="source-line-no">205</span><span id="line-205">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanner.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanner.html
index 590855143e0..7db35c7489a 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanner.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScanner.html
@@ -33,578 +33,570 @@
<span class="source-line-no">020</span><span id="line-20">import static org.apache.hadoop.hbase.HBaseTestingUtil.START_KEY_BYTES;</span>
<span class="source-line-no">021</span><span id="line-21">import static org.apache.hadoop.hbase.HBaseTestingUtil.fam1;</span>
<span class="source-line-no">022</span><span id="line-22">import static org.apache.hadoop.hbase.HBaseTestingUtil.fam2;</span>
-<span class="source-line-no">023</span><span id="line-23">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">024</span><span id="line-24">import static org.junit.Assert.assertFalse;</span>
-<span class="source-line-no">025</span><span id="line-25">import static org.junit.Assert.assertNotNull;</span>
-<span class="source-line-no">026</span><span id="line-26">import static org.junit.Assert.assertTrue;</span>
-<span class="source-line-no">027</span><span id="line-27">import static org.junit.Assert.fail;</span>
+<span class="source-line-no">023</span><span id="line-23">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">024</span><span id="line-24">import static org.junit.jupiter.api.Assertions.assertFalse;</span>
+<span class="source-line-no">025</span><span id="line-25">import static org.junit.jupiter.api.Assertions.assertNotNull;</span>
+<span class="source-line-no">026</span><span id="line-26">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
+<span class="source-line-no">027</span><span id="line-27">import static org.junit.jupiter.api.Assertions.fail;</span>
<span class="source-line-no">028</span><span id="line-28"></span>
<span class="source-line-no">029</span><span id="line-29">import java.io.IOException;</span>
<span class="source-line-no">030</span><span id="line-30">import java.util.ArrayList;</span>
<span class="source-line-no">031</span><span id="line-31">import java.util.List;</span>
<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.Cell;</span>
<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.CellUtil;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.HTestConst;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.UnknownScannerException;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.client.Delete;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.client.Get;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.client.RegionInfo;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.RegionInfoBuilder;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.filter.Filter;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.filter.InclusiveStopFilter;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.filter.PrefixFilter;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.filter.WhileMatchFilter;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
-<span class="source-line-no">060</span><span id="line-60">import org.junit.ClassRule;</span>
-<span class="source-line-no">061</span><span id="line-61">import org.junit.Rule;</span>
-<span class="source-line-no">062</span><span id="line-62">import org.junit.Test;</span>
-<span class="source-line-no">063</span><span id="line-63">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">064</span><span id="line-64">import org.junit.rules.TestName;</span>
-<span class="source-line-no">065</span><span id="line-65">import org.slf4j.Logger;</span>
-<span class="source-line-no">066</span><span id="line-66">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">/**</span>
-<span class="source-line-no">069</span><span id="line-69"> * Test of a long-lived scanner validating as we go.</span>
-<span class="source-line-no">070</span><span id="line-70"> */</span>
-<span class="source-line-no">071</span><span id="line-71">@Category({ RegionServerTests.class, MediumTests.class })</span>
-<span class="source-line-no">072</span><span id="line-72">public class TestScanner {</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74"> @ClassRule</span>
-<span class="source-line-no">075</span><span id="line-75"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">076</span><span id="line-76"> HBaseClassTestRule.forClass(TestScanner.class);</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78"> @Rule</span>
-<span class="source-line-no">079</span><span id="line-79"> public TestName name = new TestName();</span>
-<span class="source-line-no">080</span><span id="line-80"></span>
-<span class="source-line-no">081</span><span id="line-81"> private static final Logger LOG = LoggerFactory.getLogger(TestScanner.class);</span>
-<span class="source-line-no">082</span><span id="line-82"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84"> private static final byte[] FIRST_ROW = HConstants.EMPTY_START_ROW;</span>
-<span class="source-line-no">085</span><span id="line-85"> private static final byte[][] COLS = { HConstants.CATALOG_FAMILY };</span>
-<span class="source-line-no">086</span><span id="line-86"> private static final byte[][] EXPLICIT_COLS =</span>
-<span class="source-line-no">087</span><span id="line-87"> { HConstants.REGIONINFO_QUALIFIER, HConstants.SERVER_QUALIFIER,</span>
-<span class="source-line-no">088</span><span id="line-88"> // TODO ryan</span>
-<span class="source-line-no">089</span><span id="line-89"> // HConstants.STARTCODE_QUALIFIER</span>
-<span class="source-line-no">090</span><span id="line-90"> };</span>
-<span class="source-line-no">091</span><span id="line-91"></span>
-<span class="source-line-no">092</span><span id="line-92"> static final TableDescriptor TESTTABLEDESC =</span>
-<span class="source-line-no">093</span><span id="line-93"> TableDescriptorBuilder.newBuilder(TableName.valueOf("testscanner"))</span>
-<span class="source-line-no">094</span><span id="line-94"> .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(HConstants.CATALOG_FAMILY)</span>
-<span class="source-line-no">095</span><span id="line-95"> // Ten is an arbitrary number. Keep versions to help debugging.</span>
-<span class="source-line-no">096</span><span id="line-96"> .setMaxVersions(10).setBlockCacheEnabled(false).setBlocksize(8 * 1024).build())</span>
-<span class="source-line-no">097</span><span id="line-97"> .build();</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99"> /** HRegionInfo for root region */</span>
-<span class="source-line-no">100</span><span id="line-100"> public static final RegionInfo REGION_INFO =</span>
-<span class="source-line-no">101</span><span id="line-101"> RegionInfoBuilder.newBuilder(TESTTABLEDESC.getTableName()).build();</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.HTestConst;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.UnknownScannerException;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.Delete;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.client.Get;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.client.RegionInfo;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.client.RegionInfoBuilder;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.filter.Filter;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.filter.InclusiveStopFilter;</span>
+<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.filter.PrefixFilter;</span>
+<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.filter.WhileMatchFilter;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
+<span class="source-line-no">059</span><span id="line-59">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">060</span><span id="line-60">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">061</span><span id="line-61">import org.junit.jupiter.api.TestInfo;</span>
+<span class="source-line-no">062</span><span id="line-62">import org.slf4j.Logger;</span>
+<span class="source-line-no">063</span><span id="line-63">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65">/**</span>
+<span class="source-line-no">066</span><span id="line-66"> * Test of a long-lived scanner validating as we go.</span>
+<span class="source-line-no">067</span><span id="line-67"> */</span>
+<span class="source-line-no">068</span><span id="line-68">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">069</span><span id="line-69">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">070</span><span id="line-70">public class TestScanner {</span>
+<span class="source-line-no">071</span><span id="line-71"></span>
+<span class="source-line-no">072</span><span id="line-72"> private static final Logger LOG = LoggerFactory.getLogger(TestScanner.class);</span>
+<span class="source-line-no">073</span><span id="line-73"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">074</span><span id="line-74"></span>
+<span class="source-line-no">075</span><span id="line-75"> private static final byte[] FIRST_ROW = HConstants.EMPTY_START_ROW;</span>
+<span class="source-line-no">076</span><span id="line-76"> private static final byte[][] COLS = { HConstants.CATALOG_FAMILY };</span>
+<span class="source-line-no">077</span><span id="line-77"> private static final byte[][] EXPLICIT_COLS =</span>
+<span class="source-line-no">078</span><span id="line-78"> { HConstants.REGIONINFO_QUALIFIER, HConstants.SERVER_QUALIFIER,</span>
+<span class="source-line-no">079</span><span id="line-79"> // TODO ryan</span>
+<span class="source-line-no">080</span><span id="line-80"> // HConstants.STARTCODE_QUALIFIER</span>
+<span class="source-line-no">081</span><span id="line-81"> };</span>
+<span class="source-line-no">082</span><span id="line-82"></span>
+<span class="source-line-no">083</span><span id="line-83"> static final TableDescriptor TESTTABLEDESC =</span>
+<span class="source-line-no">084</span><span id="line-84"> TableDescriptorBuilder.newBuilder(TableName.valueOf("testscanner"))</span>
+<span class="source-line-no">085</span><span id="line-85"> .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(HConstants.CATALOG_FAMILY)</span>
+<span class="source-line-no">086</span><span id="line-86"> // Ten is an arbitrary number. Keep versions to help debugging.</span>
+<span class="source-line-no">087</span><span id="line-87"> .setMaxVersions(10).setBlockCacheEnabled(false).setBlocksize(8 * 1024).build())</span>
+<span class="source-line-no">088</span><span id="line-88"> .build();</span>
+<span class="source-line-no">089</span><span id="line-89"></span>
+<span class="source-line-no">090</span><span id="line-90"> /** HRegionInfo for root region */</span>
+<span class="source-line-no">091</span><span id="line-91"> public static final RegionInfo REGION_INFO =</span>
+<span class="source-line-no">092</span><span id="line-92"> RegionInfoBuilder.newBuilder(TESTTABLEDESC.getTableName()).build();</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94"> private static final byte[] ROW_KEY = REGION_INFO.getRegionName();</span>
+<span class="source-line-no">095</span><span id="line-95"></span>
+<span class="source-line-no">096</span><span id="line-96"> private static final long START_CODE = Long.MAX_VALUE;</span>
+<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">098</span><span id="line-98"> private HRegion region;</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100"> private byte[] firstRowBytes, secondRowBytes, thirdRowBytes;</span>
+<span class="source-line-no">101</span><span id="line-101"> final private byte[] col1;</span>
<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103"> private static final byte[] ROW_KEY = REGION_INFO.getRegionName();</span>
-<span class="source-line-no">104</span><span id="line-104"></span>
-<span class="source-line-no">105</span><span id="line-105"> private static final long START_CODE = Long.MAX_VALUE;</span>
-<span class="source-line-no">106</span><span id="line-106"></span>
-<span class="source-line-no">107</span><span id="line-107"> private HRegion region;</span>
-<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109"> private byte[] firstRowBytes, secondRowBytes, thirdRowBytes;</span>
-<span class="source-line-no">110</span><span id="line-110"> final private byte[] col1;</span>
-<span class="source-line-no">111</span><span id="line-111"></span>
-<span class="source-line-no">112</span><span id="line-112"> public TestScanner() {</span>
-<span class="source-line-no">113</span><span id="line-113"> super();</span>
-<span class="source-line-no">114</span><span id="line-114"></span>
-<span class="source-line-no">115</span><span id="line-115"> firstRowBytes = START_KEY_BYTES;</span>
-<span class="source-line-no">116</span><span id="line-116"> secondRowBytes = START_KEY_BYTES.clone();</span>
-<span class="source-line-no">117</span><span id="line-117"> // Increment the least significant character so we get to next row.</span>
-<span class="source-line-no">118</span><span id="line-118"> secondRowBytes[START_KEY_BYTES.length - 1]++;</span>
-<span class="source-line-no">119</span><span id="line-119"> thirdRowBytes = START_KEY_BYTES.clone();</span>
-<span class="source-line-no">120</span><span id="line-120"> thirdRowBytes[START_KEY_BYTES.length - 1] =</span>
-<span class="source-line-no">121</span><span id="line-121"> (byte) (thirdRowBytes[START_KEY_BYTES.length - 1] + 2);</span>
-<span class="source-line-no">122</span><span id="line-122"> col1 = Bytes.toBytes("column1");</span>
-<span class="source-line-no">123</span><span id="line-123"> }</span>
-<span class="source-line-no">124</span><span id="line-124"></span>
-<span class="source-line-no">125</span><span id="line-125"> /**</span>
-<span class="source-line-no">126</span><span id="line-126"> * Test basic stop row filter works.</span>
-<span class="source-line-no">127</span><span id="line-127"> */</span>
-<span class="source-line-no">128</span><span id="line-128"> @Test</span>
-<span class="source-line-no">129</span><span id="line-129"> public void testStopRow() throws Exception {</span>
-<span class="source-line-no">130</span><span id="line-130"> byte[] startrow = Bytes.toBytes("bbb");</span>
-<span class="source-line-no">131</span><span id="line-131"> byte[] stoprow = Bytes.toBytes("ccc");</span>
-<span class="source-line-no">132</span><span id="line-132"> try {</span>
-<span class="source-line-no">133</span><span id="line-133"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
-<span class="source-line-no">134</span><span id="line-134"> HTestConst.addContent(this.region, HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">135</span><span id="line-135"> List<Cell> results = new ArrayList<>();</span>
-<span class="source-line-no">136</span><span id="line-136"> // Do simple test of getting one row only first.</span>
-<span class="source-line-no">137</span><span id="line-137"> Scan scan = new Scan().withStartRow(Bytes.toBytes("abc")).withStopRow(Bytes.toBytes("abd"));</span>
-<span class="source-line-no">138</span><span id="line-138"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">139</span><span id="line-139"></span>
-<span class="source-line-no">140</span><span id="line-140"> InternalScanner s = region.getScanner(scan);</span>
-<span class="source-line-no">141</span><span id="line-141"> int count = 0;</span>
-<span class="source-line-no">142</span><span id="line-142"> while (s.next(results)) {</span>
-<span class="source-line-no">143</span><span id="line-143"> count++;</span>
-<span class="source-line-no">144</span><span id="line-144"> }</span>
-<span class="source-line-no">145</span><span id="line-145"> s.close();</span>
-<span class="source-line-no">146</span><span id="line-146"> assertEquals(0, count);</span>
-<span class="source-line-no">147</span><span id="line-147"> // Now do something a bit more imvolved.</span>
-<span class="source-line-no">148</span><span id="line-148"> scan = new Scan().withStartRow(startrow).withStopRow(stoprow);</span>
-<span class="source-line-no">149</span><span id="line-149"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">150</span><span id="line-150"></span>
-<span class="source-line-no">151</span><span id="line-151"> s = region.getScanner(scan);</span>
-<span class="source-line-no">152</span><span id="line-152"> count = 0;</span>
-<span class="source-line-no">153</span><span id="line-153"> Cell kv = null;</span>
-<span class="source-line-no">154</span><span id="line-154"> results = new ArrayList<>();</span>
-<span class="source-line-no">155</span><span id="line-155"> for (boolean first = true; s.next(results);) {</span>
-<span class="source-line-no">156</span><span id="line-156"> kv = results.get(0);</span>
-<span class="source-line-no">157</span><span id="line-157"> if (first) {</span>
-<span class="source-line-no">158</span><span id="line-158"> assertTrue(CellUtil.matchingRows(kv, startrow));</span>
-<span class="source-line-no">159</span><span id="line-159"> first = false;</span>
-<span class="source-line-no">160</span><span id="line-160"> }</span>
-<span class="source-line-no">161</span><span id="line-161"> count++;</span>
-<span class="source-line-no">162</span><span id="line-162"> }</span>
-<span class="source-line-no">163</span><span id="line-163"> assertTrue(Bytes.BYTES_COMPARATOR.compare(stoprow, CellUtil.cloneRow(kv)) > 0);</span>
-<span class="source-line-no">164</span><span id="line-164"> // We got something back.</span>
-<span class="source-line-no">165</span><span id="line-165"> assertTrue(count > 10);</span>
-<span class="source-line-no">166</span><span id="line-166"> s.close();</span>
-<span class="source-line-no">167</span><span id="line-167"> } finally {</span>
-<span class="source-line-no">168</span><span id="line-168"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">169</span><span id="line-169"> }</span>
-<span class="source-line-no">170</span><span id="line-170"> }</span>
-<span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172"> void rowPrefixFilter(Scan scan) throws IOException {</span>
-<span class="source-line-no">173</span><span id="line-173"> List<Cell> results = new ArrayList<>();</span>
-<span class="source-line-no">174</span><span id="line-174"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">175</span><span id="line-175"> InternalScanner s = region.getScanner(scan);</span>
-<span class="source-line-no">176</span><span id="line-176"> boolean hasMore = true;</span>
-<span class="source-line-no">177</span><span id="line-177"> while (hasMore) {</span>
-<span class="source-line-no">178</span><span id="line-178"> hasMore = s.next(results);</span>
-<span class="source-line-no">179</span><span id="line-179"> for (Cell kv : results) {</span>
-<span class="source-line-no">180</span><span id="line-180"> assertEquals((byte) 'a', CellUtil.cloneRow(kv)[0]);</span>
-<span class="source-line-no">181</span><span id="line-181"> assertEquals((byte) 'b', CellUtil.cloneRow(kv)[1]);</span>
-<span class="source-line-no">182</span><span id="line-182"> }</span>
-<span class="source-line-no">183</span><span id="line-183"> results.clear();</span>
-<span class="source-line-no">184</span><span id="line-184"> }</span>
-<span class="source-line-no">185</span><span id="line-185"> s.close();</span>
-<span class="source-line-no">186</span><span id="line-186"> }</span>
-<span class="source-line-no">187</span><span id="line-187"></span>
-<span class="source-line-no">188</span><span id="line-188"> void rowInclusiveStopFilter(Scan scan, byte[] stopRow) throws IOException {</span>
-<span class="source-line-no">189</span><span id="line-189"> List<Cell> results = new ArrayList<>();</span>
-<span class="source-line-no">190</span><span id="line-190"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">191</span><span id="line-191"> InternalScanner s = region.getScanner(scan);</span>
-<span class="source-line-no">192</span><span id="line-192"> boolean hasMore = true;</span>
-<span class="source-line-no">193</span><span id="line-193"> while (hasMore) {</span>
-<span class="source-line-no">194</span><span id="line-194"> hasMore = s.next(results);</span>
-<span class="source-line-no">195</span><span id="line-195"> for (Cell kv : results) {</span>
-<span class="source-line-no">196</span><span id="line-196"> assertTrue(Bytes.compareTo(CellUtil.cloneRow(kv), stopRow) <= 0);</span>
-<span class="source-line-no">197</span><span id="line-197"> }</span>
-<span class="source-line-no">198</span><span id="line-198"> results.clear();</span>
-<span class="source-line-no">199</span><span id="line-199"> }</span>
-<span class="source-line-no">200</span><span id="line-200"> s.close();</span>
-<span class="source-line-no">201</span><span id="line-201"> }</span>
-<span class="source-line-no">202</span><span id="line-202"></span>
-<span class="source-line-no">203</span><span id="line-203"> @Test</span>
-<span class="source-line-no">204</span><span id="line-204"> public void testFilters() throws IOException {</span>
-<span class="source-line-no">205</span><span id="line-205"> try {</span>
-<span class="source-line-no">206</span><span id="line-206"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
-<span class="source-line-no">207</span><span id="line-207"> HTestConst.addContent(this.region, HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">208</span><span id="line-208"> byte[] prefix = Bytes.toBytes("ab");</span>
-<span class="source-line-no">209</span><span id="line-209"> Filter newFilter = new PrefixFilter(prefix);</span>
-<span class="source-line-no">210</span><span id="line-210"> Scan scan = new Scan();</span>
-<span class="source-line-no">211</span><span id="line-211"> scan.setFilter(newFilter);</span>
-<span class="source-line-no">212</span><span id="line-212"> rowPrefixFilter(scan);</span>
-<span class="source-line-no">213</span><span id="line-213"></span>
-<span class="source-line-no">214</span><span id="line-214"> byte[] stopRow = Bytes.toBytes("bbc");</span>
-<span class="source-line-no">215</span><span id="line-215"> newFilter = new WhileMatchFilter(new InclusiveStopFilter(stopRow));</span>
-<span class="source-line-no">216</span><span id="line-216"> scan = new Scan();</span>
-<span class="source-line-no">217</span><span id="line-217"> scan.setFilter(newFilter);</span>
-<span class="source-line-no">218</span><span id="line-218"> rowInclusiveStopFilter(scan, stopRow);</span>
-<span class="source-line-no">219</span><span id="line-219"></span>
-<span class="source-line-no">220</span><span id="line-220"> } finally {</span>
-<span class="source-line-no">221</span><span id="line-221"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">222</span><span id="line-222"> }</span>
-<span class="source-line-no">223</span><span id="line-223"> }</span>
-<span class="source-line-no">224</span><span id="line-224"></span>
-<span class="source-line-no">225</span><span id="line-225"> /**</span>
-<span class="source-line-no">226</span><span id="line-226"> * Test that closing a scanner while a client is using it doesn't throw NPEs but instead a</span>
-<span class="source-line-no">227</span><span id="line-227"> * UnknownScannerException. HBASE-2503</span>
-<span class="source-line-no">228</span><span id="line-228"> */</span>
-<span class="source-line-no">229</span><span id="line-229"> @Test</span>
-<span class="source-line-no">230</span><span id="line-230"> public void testRaceBetweenClientAndTimeout() throws Exception {</span>
-<span class="source-line-no">231</span><span id="line-231"> try {</span>
-<span class="source-line-no">232</span><span id="line-232"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
-<span class="source-line-no">233</span><span id="line-233"> HTestConst.addContent(this.region, HConstants.CATALOG_FAMILY);</span>
-<span class="source-line-no">234</span><span id="line-234"> Scan scan = new Scan();</span>
-<span class="source-line-no">235</span><span id="line-235"> InternalScanner s = region.getScanner(scan);</span>
-<span class="source-line-no">236</span><span id="line-236"> List<Cell> results = new ArrayList<>();</span>
-<span class="source-line-no">237</span><span id="line-237"> try {</span>
-<span class="source-line-no">238</span><span id="line-238"> s.next(results);</span>
-<span class="source-line-no">239</span><span id="line-239"> s.close();</span>
-<span class="source-line-no">240</span><span id="line-240"> s.next(results);</span>
-<span class="source-line-no">241</span><span id="line-241"> fail("We don't want anything more, we should be failing");</span>
-<span class="source-line-no">242</span><span id="line-242"> } catch (UnknownScannerException ex) {</span>
-<span class="source-line-no">243</span><span id="line-243"> // ok!</span>
-<span class="source-line-no">244</span><span id="line-244"> return;</span>
-<span class="source-line-no">245</span><span id="line-245"> }</span>
-<span class="source-line-no">246</span><span id="line-246"> } finally {</span>
-<span class="source-line-no">247</span><span id="line-247"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">248</span><span id="line-248"> }</span>
-<span class="source-line-no">249</span><span id="line-249"> }</span>
+<span class="source-line-no">103</span><span id="line-103"> public TestScanner() {</span>
+<span class="source-line-no">104</span><span id="line-104"> super();</span>
+<span class="source-line-no">105</span><span id="line-105"></span>
+<span class="source-line-no">106</span><span id="line-106"> firstRowBytes = START_KEY_BYTES;</span>
+<span class="source-line-no">107</span><span id="line-107"> secondRowBytes = START_KEY_BYTES.clone();</span>
+<span class="source-line-no">108</span><span id="line-108"> // Increment the least significant character so we get to next row.</span>
+<span class="source-line-no">109</span><span id="line-109"> secondRowBytes[START_KEY_BYTES.length - 1]++;</span>
+<span class="source-line-no">110</span><span id="line-110"> thirdRowBytes = START_KEY_BYTES.clone();</span>
+<span class="source-line-no">111</span><span id="line-111"> thirdRowBytes[START_KEY_BYTES.length - 1] =</span>
+<span class="source-line-no">112</span><span id="line-112"> (byte) (thirdRowBytes[START_KEY_BYTES.length - 1] + 2);</span>
+<span class="source-line-no">113</span><span id="line-113"> col1 = Bytes.toBytes("column1");</span>
+<span class="source-line-no">114</span><span id="line-114"> }</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116"> /**</span>
+<span class="source-line-no">117</span><span id="line-117"> * Test basic stop row filter works.</span>
+<span class="source-line-no">118</span><span id="line-118"> */</span>
+<span class="source-line-no">119</span><span id="line-119"> @Test</span>
+<span class="source-line-no">120</span><span id="line-120"> public void testStopRow() throws Exception {</span>
+<span class="source-line-no">121</span><span id="line-121"> byte[] startrow = Bytes.toBytes("bbb");</span>
+<span class="source-line-no">122</span><span id="line-122"> byte[] stoprow = Bytes.toBytes("ccc");</span>
+<span class="source-line-no">123</span><span id="line-123"> try {</span>
+<span class="source-line-no">124</span><span id="line-124"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
+<span class="source-line-no">125</span><span id="line-125"> HTestConst.addContent(this.region, HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">126</span><span id="line-126"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">127</span><span id="line-127"> // Do simple test of getting one row only first.</span>
+<span class="source-line-no">128</span><span id="line-128"> Scan scan = new Scan().withStartRow(Bytes.toBytes("abc")).withStopRow(Bytes.toBytes("abd"));</span>
+<span class="source-line-no">129</span><span id="line-129"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">130</span><span id="line-130"></span>
+<span class="source-line-no">131</span><span id="line-131"> InternalScanner s = region.getScanner(scan);</span>
+<span class="source-line-no">132</span><span id="line-132"> int count = 0;</span>
+<span class="source-line-no">133</span><span id="line-133"> while (s.next(results)) {</span>
+<span class="source-line-no">134</span><span id="line-134"> count++;</span>
+<span class="source-line-no">135</span><span id="line-135"> }</span>
+<span class="source-line-no">136</span><span id="line-136"> s.close();</span>
+<span class="source-line-no">137</span><span id="line-137"> assertEquals(0, count);</span>
+<span class="source-line-no">138</span><span id="line-138"> // Now do something a bit more imvolved.</span>
+<span class="source-line-no">139</span><span id="line-139"> scan = new Scan().withStartRow(startrow).withStopRow(stoprow);</span>
+<span class="source-line-no">140</span><span id="line-140"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">141</span><span id="line-141"></span>
+<span class="source-line-no">142</span><span id="line-142"> s = region.getScanner(scan);</span>
+<span class="source-line-no">143</span><span id="line-143"> count = 0;</span>
+<span class="source-line-no">144</span><span id="line-144"> Cell kv = null;</span>
+<span class="source-line-no">145</span><span id="line-145"> results = new ArrayList<>();</span>
+<span class="source-line-no">146</span><span id="line-146"> for (boolean first = true; s.next(results);) {</span>
+<span class="source-line-no">147</span><span id="line-147"> kv = results.get(0);</span>
+<span class="source-line-no">148</span><span id="line-148"> if (first) {</span>
+<span class="source-line-no">149</span><span id="line-149"> assertTrue(CellUtil.matchingRows(kv, startrow));</span>
+<span class="source-line-no">150</span><span id="line-150"> first = false;</span>
+<span class="source-line-no">151</span><span id="line-151"> }</span>
+<span class="source-line-no">152</span><span id="line-152"> count++;</span>
+<span class="source-line-no">153</span><span id="line-153"> }</span>
+<span class="source-line-no">154</span><span id="line-154"> assertTrue(Bytes.BYTES_COMPARATOR.compare(stoprow, CellUtil.cloneRow(kv)) > 0);</span>
+<span class="source-line-no">155</span><span id="line-155"> // We got something back.</span>
+<span class="source-line-no">156</span><span id="line-156"> assertTrue(count > 10);</span>
+<span class="source-line-no">157</span><span id="line-157"> s.close();</span>
+<span class="source-line-no">158</span><span id="line-158"> } finally {</span>
+<span class="source-line-no">159</span><span id="line-159"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">160</span><span id="line-160"> }</span>
+<span class="source-line-no">161</span><span id="line-161"> }</span>
+<span class="source-line-no">162</span><span id="line-162"></span>
+<span class="source-line-no">163</span><span id="line-163"> void rowPrefixFilter(Scan scan) throws IOException {</span>
+<span class="source-line-no">164</span><span id="line-164"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">165</span><span id="line-165"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">166</span><span id="line-166"> InternalScanner s = region.getScanner(scan);</span>
+<span class="source-line-no">167</span><span id="line-167"> boolean hasMore = true;</span>
+<span class="source-line-no">168</span><span id="line-168"> while (hasMore) {</span>
+<span class="source-line-no">169</span><span id="line-169"> hasMore = s.next(results);</span>
+<span class="source-line-no">170</span><span id="line-170"> for (Cell kv : results) {</span>
+<span class="source-line-no">171</span><span id="line-171"> assertEquals((byte) 'a', CellUtil.cloneRow(kv)[0]);</span>
+<span class="source-line-no">172</span><span id="line-172"> assertEquals((byte) 'b', CellUtil.cloneRow(kv)[1]);</span>
+<span class="source-line-no">173</span><span id="line-173"> }</span>
+<span class="source-line-no">174</span><span id="line-174"> results.clear();</span>
+<span class="source-line-no">175</span><span id="line-175"> }</span>
+<span class="source-line-no">176</span><span id="line-176"> s.close();</span>
+<span class="source-line-no">177</span><span id="line-177"> }</span>
+<span class="source-line-no">178</span><span id="line-178"></span>
+<span class="source-line-no">179</span><span id="line-179"> void rowInclusiveStopFilter(Scan scan, byte[] stopRow) throws IOException {</span>
+<span class="source-line-no">180</span><span id="line-180"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">181</span><span id="line-181"> scan.addFamily(HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">182</span><span id="line-182"> InternalScanner s = region.getScanner(scan);</span>
+<span class="source-line-no">183</span><span id="line-183"> boolean hasMore = true;</span>
+<span class="source-line-no">184</span><span id="line-184"> while (hasMore) {</span>
+<span class="source-line-no">185</span><span id="line-185"> hasMore = s.next(results);</span>
+<span class="source-line-no">186</span><span id="line-186"> for (Cell kv : results) {</span>
+<span class="source-line-no">187</span><span id="line-187"> assertTrue(Bytes.compareTo(CellUtil.cloneRow(kv), stopRow) <= 0);</span>
+<span class="source-line-no">188</span><span id="line-188"> }</span>
+<span class="source-line-no">189</span><span id="line-189"> results.clear();</span>
+<span class="source-line-no">190</span><span id="line-190"> }</span>
+<span class="source-line-no">191</span><span id="line-191"> s.close();</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">193</span><span id="line-193"></span>
+<span class="source-line-no">194</span><span id="line-194"> @Test</span>
+<span class="source-line-no">195</span><span id="line-195"> public void testFilters() throws IOException {</span>
+<span class="source-line-no">196</span><span id="line-196"> try {</span>
+<span class="source-line-no">197</span><span id="line-197"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
+<span class="source-line-no">198</span><span id="line-198"> HTestConst.addContent(this.region, HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">199</span><span id="line-199"> byte[] prefix = Bytes.toBytes("ab");</span>
+<span class="source-line-no">200</span><span id="line-200"> Filter newFilter = new PrefixFilter(prefix);</span>
+<span class="source-line-no">201</span><span id="line-201"> Scan scan = new Scan();</span>
+<span class="source-line-no">202</span><span id="line-202"> scan.setFilter(newFilter);</span>
+<span class="source-line-no">203</span><span id="line-203"> rowPrefixFilter(scan);</span>
+<span class="source-line-no">204</span><span id="line-204"></span>
+<span class="source-line-no">205</span><span id="line-205"> byte[] stopRow = Bytes.toBytes("bbc");</span>
+<span class="source-line-no">206</span><span id="line-206"> newFilter = new WhileMatchFilter(new InclusiveStopFilter(stopRow));</span>
+<span class="source-line-no">207</span><span id="line-207"> scan = new Scan();</span>
+<span class="source-line-no">208</span><span id="line-208"> scan.setFilter(newFilter);</span>
+<span class="source-line-no">209</span><span id="line-209"> rowInclusiveStopFilter(scan, stopRow);</span>
+<span class="source-line-no">210</span><span id="line-210"></span>
+<span class="source-line-no">211</span><span id="line-211"> } finally {</span>
+<span class="source-line-no">212</span><span id="line-212"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">213</span><span id="line-213"> }</span>
+<span class="source-line-no">214</span><span id="line-214"> }</span>
+<span class="source-line-no">215</span><span id="line-215"></span>
+<span class="source-line-no">216</span><span id="line-216"> /**</span>
+<span class="source-line-no">217</span><span id="line-217"> * Test that closing a scanner while a client is using it doesn't throw NPEs but instead a</span>
+<span class="source-line-no">218</span><span id="line-218"> * UnknownScannerException. HBASE-2503</span>
+<span class="source-line-no">219</span><span id="line-219"> */</span>
+<span class="source-line-no">220</span><span id="line-220"> @Test</span>
+<span class="source-line-no">221</span><span id="line-221"> public void testRaceBetweenClientAndTimeout() throws Exception {</span>
+<span class="source-line-no">222</span><span id="line-222"> try {</span>
+<span class="source-line-no">223</span><span id="line-223"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
+<span class="source-line-no">224</span><span id="line-224"> HTestConst.addContent(this.region, HConstants.CATALOG_FAMILY);</span>
+<span class="source-line-no">225</span><span id="line-225"> Scan scan = new Scan();</span>
+<span class="source-line-no">226</span><span id="line-226"> InternalScanner s = region.getScanner(scan);</span>
+<span class="source-line-no">227</span><span id="line-227"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">228</span><span id="line-228"> try {</span>
+<span class="source-line-no">229</span><span id="line-229"> s.next(results);</span>
+<span class="source-line-no">230</span><span id="line-230"> s.close();</span>
+<span class="source-line-no">231</span><span id="line-231"> s.next(results);</span>
+<span class="source-line-no">232</span><span id="line-232"> fail("We don't want anything more, we should be failing");</span>
+<span class="source-line-no">233</span><span id="line-233"> } catch (UnknownScannerException ex) {</span>
+<span class="source-line-no">234</span><span id="line-234"> // ok!</span>
+<span class="source-line-no">235</span><span id="line-235"> return;</span>
+<span class="source-line-no">236</span><span id="line-236"> }</span>
+<span class="source-line-no">237</span><span id="line-237"> } finally {</span>
+<span class="source-line-no">238</span><span id="line-238"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">239</span><span id="line-239"> }</span>
+<span class="source-line-no">240</span><span id="line-240"> }</span>
+<span class="source-line-no">241</span><span id="line-241"></span>
+<span class="source-line-no">242</span><span id="line-242"> /**</span>
+<span class="source-line-no">243</span><span id="line-243"> * The test!</span>
+<span class="source-line-no">244</span><span id="line-244"> */</span>
+<span class="source-line-no">245</span><span id="line-245"> @Test</span>
+<span class="source-line-no">246</span><span id="line-246"> public void testScanner() throws IOException {</span>
+<span class="source-line-no">247</span><span id="line-247"> try {</span>
+<span class="source-line-no">248</span><span id="line-248"> region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
+<span class="source-line-no">249</span><span id="line-249"> Table table = new RegionAsTable(region);</span>
<span class="source-line-no">250</span><span id="line-250"></span>
-<span class="source-line-no">251</span><span id="line-251"> /**</span>
-<span class="source-line-no">252</span><span id="line-252"> * The test!</span>
-<span class="source-line-no">253</span><span id="line-253"> */</span>
-<span class="source-line-no">254</span><span id="line-254"> @Test</span>
-<span class="source-line-no">255</span><span id="line-255"> public void testScanner() throws IOException {</span>
-<span class="source-line-no">256</span><span id="line-256"> try {</span>
-<span class="source-line-no">257</span><span id="line-257"> region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
-<span class="source-line-no">258</span><span id="line-258"> Table table = new RegionAsTable(region);</span>
-<span class="source-line-no">259</span><span id="line-259"></span>
-<span class="source-line-no">260</span><span id="line-260"> // Write information to the meta table</span>
+<span class="source-line-no">251</span><span id="line-251"> // Write information to the meta table</span>
+<span class="source-line-no">252</span><span id="line-252"></span>
+<span class="source-line-no">253</span><span id="line-253"> Put put = new Put(ROW_KEY, EnvironmentEdgeManager.currentTime());</span>
+<span class="source-line-no">254</span><span id="line-254"></span>
+<span class="source-line-no">255</span><span id="line-255"> put.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,</span>
+<span class="source-line-no">256</span><span id="line-256"> RegionInfo.toByteArray(REGION_INFO));</span>
+<span class="source-line-no">257</span><span id="line-257"> table.put(put);</span>
+<span class="source-line-no">258</span><span id="line-258"></span>
+<span class="source-line-no">259</span><span id="line-259"> // What we just committed is in the memstore. Verify that we can get</span>
+<span class="source-line-no">260</span><span id="line-260"> // it back both with scanning and get</span>
<span class="source-line-no">261</span><span id="line-261"></span>
-<span class="source-line-no">262</span><span id="line-262"> Put put = new Put(ROW_KEY, EnvironmentEdgeManager.currentTime());</span>
-<span class="source-line-no">263</span><span id="line-263"></span>
-<span class="source-line-no">264</span><span id="line-264"> put.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,</span>
-<span class="source-line-no">265</span><span id="line-265"> RegionInfo.toByteArray(REGION_INFO));</span>
-<span class="source-line-no">266</span><span id="line-266"> table.put(put);</span>
-<span class="source-line-no">267</span><span id="line-267"></span>
-<span class="source-line-no">268</span><span id="line-268"> // What we just committed is in the memstore. Verify that we can get</span>
-<span class="source-line-no">269</span><span id="line-269"> // it back both with scanning and get</span>
+<span class="source-line-no">262</span><span id="line-262"> scan(false, null);</span>
+<span class="source-line-no">263</span><span id="line-263"> getRegionInfo(table);</span>
+<span class="source-line-no">264</span><span id="line-264"></span>
+<span class="source-line-no">265</span><span id="line-265"> // Close and re-open</span>
+<span class="source-line-no">266</span><span id="line-266"></span>
+<span class="source-line-no">267</span><span id="line-267"> ((HRegion) region).close();</span>
+<span class="source-line-no">268</span><span id="line-268"> region = HRegion.openHRegion(region, null);</span>
+<span class="source-line-no">269</span><span id="line-269"> table = new RegionAsTable(region);</span>
<span class="source-line-no">270</span><span id="line-270"></span>
-<span class="source-line-no">271</span><span id="line-271"> scan(false, null);</span>
-<span class="source-line-no">272</span><span id="line-272"> getRegionInfo(table);</span>
-<span class="source-line-no">273</span><span id="line-273"></span>
-<span class="source-line-no">274</span><span id="line-274"> // Close and re-open</span>
+<span class="source-line-no">271</span><span id="line-271"> // Verify we can get the data back now that it is on disk.</span>
+<span class="source-line-no">272</span><span id="line-272"></span>
+<span class="source-line-no">273</span><span id="line-273"> scan(false, null);</span>
+<span class="source-line-no">274</span><span id="line-274"> getRegionInfo(table);</span>
<span class="source-line-no">275</span><span id="line-275"></span>
-<span class="source-line-no">276</span><span id="line-276"> ((HRegion) region).close();</span>
-<span class="source-line-no">277</span><span id="line-277"> region = HRegion.openHRegion(region, null);</span>
-<span class="source-line-no">278</span><span id="line-278"> table = new RegionAsTable(region);</span>
+<span class="source-line-no">276</span><span id="line-276"> // Store some new information</span>
+<span class="source-line-no">277</span><span id="line-277"></span>
+<span class="source-line-no">278</span><span id="line-278"> String address = HConstants.LOCALHOST_IP + ":" + HBaseTestingUtil.randomFreePort();</span>
<span class="source-line-no">279</span><span id="line-279"></span>
-<span class="source-line-no">280</span><span id="line-280"> // Verify we can get the data back now that it is on disk.</span>
-<span class="source-line-no">281</span><span id="line-281"></span>
-<span class="source-line-no">282</span><span id="line-282"> scan(false, null);</span>
-<span class="source-line-no">283</span><span id="line-283"> getRegionInfo(table);</span>
+<span class="source-line-no">280</span><span id="line-280"> put = new Put(ROW_KEY, EnvironmentEdgeManager.currentTime());</span>
+<span class="source-line-no">281</span><span id="line-281"> put.addColumn(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER, Bytes.toBytes(address));</span>
+<span class="source-line-no">282</span><span id="line-282"></span>
+<span class="source-line-no">283</span><span id="line-283"> // put.add(HConstants.COL_STARTCODE, Bytes.toBytes(START_CODE));</span>
<span class="source-line-no">284</span><span id="line-284"></span>
-<span class="source-line-no">285</span><span id="line-285"> // Store some new information</span>
+<span class="source-line-no">285</span><span id="line-285"> table.put(put);</span>
<span class="source-line-no">286</span><span id="line-286"></span>
-<span class="source-line-no">287</span><span id="line-287"> String address = HConstants.LOCALHOST_IP + ":" + HBaseTestingUtil.randomFreePort();</span>
-<span class="source-line-no">288</span><span id="line-288"></span>
-<span class="source-line-no">289</span><span id="line-289"> put = new Put(ROW_KEY, EnvironmentEdgeManager.currentTime());</span>
-<span class="source-line-no">290</span><span id="line-290"> put.addColumn(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER, Bytes.toBytes(address));</span>
-<span class="source-line-no">291</span><span id="line-291"></span>
-<span class="source-line-no">292</span><span id="line-292"> // put.add(HConstants.COL_STARTCODE, Bytes.toBytes(START_CODE));</span>
-<span class="source-line-no">293</span><span id="line-293"></span>
-<span class="source-line-no">294</span><span id="line-294"> table.put(put);</span>
+<span class="source-line-no">287</span><span id="line-287"> // Validate that we can still get the HRegionInfo, even though it is in</span>
+<span class="source-line-no">288</span><span id="line-288"> // an older row on disk and there is a newer row in the memstore</span>
+<span class="source-line-no">289</span><span id="line-289"></span>
+<span class="source-line-no">290</span><span id="line-290"> scan(true, address.toString());</span>
+<span class="source-line-no">291</span><span id="line-291"> getRegionInfo(table);</span>
+<span class="source-line-no">292</span><span id="line-292"></span>
+<span class="source-line-no">293</span><span id="line-293"> // flush cache</span>
+<span class="source-line-no">294</span><span id="line-294"> this.region.flush(true);</span>
<span class="source-line-no">295</span><span id="line-295"></span>
-<span class="source-line-no">296</span><span id="line-296"> // Validate that we can still get the HRegionInfo, even though it is in</span>
-<span class="source-line-no">297</span><span id="line-297"> // an older row on disk and there is a newer row in the memstore</span>
-<span class="source-line-no">298</span><span id="line-298"></span>
-<span class="source-line-no">299</span><span id="line-299"> scan(true, address.toString());</span>
-<span class="source-line-no">300</span><span id="line-300"> getRegionInfo(table);</span>
-<span class="source-line-no">301</span><span id="line-301"></span>
-<span class="source-line-no">302</span><span id="line-302"> // flush cache</span>
-<span class="source-line-no">303</span><span id="line-303"> this.region.flush(true);</span>
-<span class="source-line-no">304</span><span id="line-304"></span>
-<span class="source-line-no">305</span><span id="line-305"> // Validate again</span>
+<span class="source-line-no">296</span><span id="line-296"> // Validate again</span>
+<span class="source-line-no">297</span><span id="line-297"></span>
+<span class="source-line-no">298</span><span id="line-298"> scan(true, address.toString());</span>
+<span class="source-line-no">299</span><span id="line-299"> getRegionInfo(table);</span>
+<span class="source-line-no">300</span><span id="line-300"></span>
+<span class="source-line-no">301</span><span id="line-301"> // Close and reopen</span>
+<span class="source-line-no">302</span><span id="line-302"></span>
+<span class="source-line-no">303</span><span id="line-303"> ((HRegion) region).close();</span>
+<span class="source-line-no">304</span><span id="line-304"> region = HRegion.openHRegion(region, null);</span>
+<span class="source-line-no">305</span><span id="line-305"> table = new RegionAsTable(region);</span>
<span class="source-line-no">306</span><span id="line-306"></span>
-<span class="source-line-no">307</span><span id="line-307"> scan(true, address.toString());</span>
-<span class="source-line-no">308</span><span id="line-308"> getRegionInfo(table);</span>
-<span class="source-line-no">309</span><span id="line-309"></span>
-<span class="source-line-no">310</span><span id="line-310"> // Close and reopen</span>
+<span class="source-line-no">307</span><span id="line-307"> // Validate again</span>
+<span class="source-line-no">308</span><span id="line-308"></span>
+<span class="source-line-no">309</span><span id="line-309"> scan(true, address.toString());</span>
+<span class="source-line-no">310</span><span id="line-310"> getRegionInfo(table);</span>
<span class="source-line-no">311</span><span id="line-311"></span>
-<span class="source-line-no">312</span><span id="line-312"> ((HRegion) region).close();</span>
-<span class="source-line-no">313</span><span id="line-313"> region = HRegion.openHRegion(region, null);</span>
-<span class="source-line-no">314</span><span id="line-314"> table = new RegionAsTable(region);</span>
+<span class="source-line-no">312</span><span id="line-312"> // Now update the information again</span>
+<span class="source-line-no">313</span><span id="line-313"></span>
+<span class="source-line-no">314</span><span id="line-314"> address = "bar.foo.com:4321";</span>
<span class="source-line-no">315</span><span id="line-315"></span>
-<span class="source-line-no">316</span><span id="line-316"> // Validate again</span>
+<span class="source-line-no">316</span><span id="line-316"> put = new Put(ROW_KEY, EnvironmentEdgeManager.currentTime());</span>
<span class="source-line-no">317</span><span id="line-317"></span>
-<span class="source-line-no">318</span><span id="line-318"> scan(true, address.toString());</span>
-<span class="source-line-no">319</span><span id="line-319"> getRegionInfo(table);</span>
+<span class="source-line-no">318</span><span id="line-318"> put.addColumn(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER, Bytes.toBytes(address));</span>
+<span class="source-line-no">319</span><span id="line-319"> table.put(put);</span>
<span class="source-line-no">320</span><span id="line-320"></span>
-<span class="source-line-no">321</span><span id="line-321"> // Now update the information again</span>
+<span class="source-line-no">321</span><span id="line-321"> // Validate again</span>
<span class="source-line-no">322</span><span id="line-322"></span>
-<span class="source-line-no">323</span><span id="line-323"> address = "bar.foo.com:4321";</span>
-<span class="source-line-no">324</span><span id="line-324"></span>
-<span class="source-line-no">325</span><span id="line-325"> put = new Put(ROW_KEY, EnvironmentEdgeManager.currentTime());</span>
-<span class="source-line-no">326</span><span id="line-326"></span>
-<span class="source-line-no">327</span><span id="line-327"> put.addColumn(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER, Bytes.toBytes(address));</span>
-<span class="source-line-no">328</span><span id="line-328"> table.put(put);</span>
+<span class="source-line-no">323</span><span id="line-323"> scan(true, address.toString());</span>
+<span class="source-line-no">324</span><span id="line-324"> getRegionInfo(table);</span>
+<span class="source-line-no">325</span><span id="line-325"></span>
+<span class="source-line-no">326</span><span id="line-326"> // flush cache</span>
+<span class="source-line-no">327</span><span id="line-327"></span>
+<span class="source-line-no">328</span><span id="line-328"> region.flush(true);</span>
<span class="source-line-no">329</span><span id="line-329"></span>
<span class="source-line-no">330</span><span id="line-330"> // Validate again</span>
<span class="source-line-no">331</span><span id="line-331"></span>
<span class="source-line-no">332</span><span id="line-332"> scan(true, address.toString());</span>
<span class="source-line-no">333</span><span id="line-333"> getRegionInfo(table);</span>
<span class="source-line-no">334</span><span id="line-334"></span>
-<span class="source-line-no">335</span><span id="line-335"> // flush cache</span>
+<span class="source-line-no">335</span><span id="line-335"> // Close and reopen</span>
<span class="source-line-no">336</span><span id="line-336"></span>
-<span class="source-line-no">337</span><span id="line-337"> region.flush(true);</span>
-<span class="source-line-no">338</span><span id="line-338"></span>
-<span class="source-line-no">339</span><span id="line-339"> // Validate again</span>
+<span class="source-line-no">337</span><span id="line-337"> ((HRegion) this.region).close();</span>
+<span class="source-line-no">338</span><span id="line-338"> this.region = HRegion.openHRegion(region, null);</span>
+<span class="source-line-no">339</span><span id="line-339"> table = new RegionAsTable(this.region);</span>
<span class="source-line-no">340</span><span id="line-340"></span>
-<span class="source-line-no">341</span><span id="line-341"> scan(true, address.toString());</span>
-<span class="source-line-no">342</span><span id="line-342"> getRegionInfo(table);</span>
-<span class="source-line-no">343</span><span id="line-343"></span>
-<span class="source-line-no">344</span><span id="line-344"> // Close and reopen</span>
+<span class="source-line-no">341</span><span id="line-341"> // Validate again</span>
+<span class="source-line-no">342</span><span id="line-342"></span>
+<span class="source-line-no">343</span><span id="line-343"> scan(true, address.toString());</span>
+<span class="source-line-no">344</span><span id="line-344"> getRegionInfo(table);</span>
<span class="source-line-no">345</span><span id="line-345"></span>
-<span class="source-line-no">346</span><span id="line-346"> ((HRegion) this.region).close();</span>
-<span class="source-line-no">347</span><span id="line-347"> this.region = HRegion.openHRegion(region, null);</span>
-<span class="source-line-no">348</span><span id="line-348"> table = new RegionAsTable(this.region);</span>
-<span class="source-line-no">349</span><span id="line-349"></span>
-<span class="source-line-no">350</span><span id="line-350"> // Validate again</span>
+<span class="source-line-no">346</span><span id="line-346"> } finally {</span>
+<span class="source-line-no">347</span><span id="line-347"> // clean up</span>
+<span class="source-line-no">348</span><span id="line-348"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">349</span><span id="line-349"> }</span>
+<span class="source-line-no">350</span><span id="line-350"> }</span>
<span class="source-line-no">351</span><span id="line-351"></span>
-<span class="source-line-no">352</span><span id="line-352"> scan(true, address.toString());</span>
-<span class="source-line-no">353</span><span id="line-353"> getRegionInfo(table);</span>
-<span class="source-line-no">354</span><span id="line-354"></span>
-<span class="source-line-no">355</span><span id="line-355"> } finally {</span>
-<span class="source-line-no">356</span><span id="line-356"> // clean up</span>
-<span class="source-line-no">357</span><span id="line-357"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">358</span><span id="line-358"> }</span>
-<span class="source-line-no">359</span><span id="line-359"> }</span>
-<span class="source-line-no">360</span><span id="line-360"></span>
-<span class="source-line-no">361</span><span id="line-361"> /** Compare the HRegionInfo we read from HBase to what we stored */</span>
-<span class="source-line-no">362</span><span id="line-362"> private void validateRegionInfo(byte[] regionBytes) throws IOException {</span>
-<span class="source-line-no">363</span><span id="line-363"> RegionInfo info = RegionInfo.parseFromOrNull(regionBytes);</span>
-<span class="source-line-no">364</span><span id="line-364"></span>
-<span class="source-line-no">365</span><span id="line-365"> assertEquals(REGION_INFO.getRegionId(), info.getRegionId());</span>
-<span class="source-line-no">366</span><span id="line-366"> assertEquals(0, info.getStartKey().length);</span>
-<span class="source-line-no">367</span><span id="line-367"> assertEquals(0, info.getEndKey().length);</span>
-<span class="source-line-no">368</span><span id="line-368"> assertEquals(0, Bytes.compareTo(info.getRegionName(), REGION_INFO.getRegionName()));</span>
-<span class="source-line-no">369</span><span id="line-369"> // assertEquals(0, info.getTableDesc().compareTo(REGION_INFO.getTableDesc()));</span>
-<span class="source-line-no">370</span><span id="line-370"> }</span>
-<span class="source-line-no">371</span><span id="line-371"></span>
-<span class="source-line-no">372</span><span id="line-372"> /** Use a scanner to get the region info and then validate the results */</span>
-<span class="source-line-no">373</span><span id="line-373"> private void scan(boolean validateStartcode, String serverName) throws IOException {</span>
-<span class="source-line-no">374</span><span id="line-374"> InternalScanner scanner = null;</span>
-<span class="source-line-no">375</span><span id="line-375"> Scan scan = null;</span>
-<span class="source-line-no">376</span><span id="line-376"> List<Cell> results = new ArrayList<>();</span>
-<span class="source-line-no">377</span><span id="line-377"> byte[][][] scanColumns = { COLS, EXPLICIT_COLS };</span>
-<span class="source-line-no">378</span><span id="line-378"> for (int i = 0; i < scanColumns.length; i++) {</span>
-<span class="source-line-no">379</span><span id="line-379"> try {</span>
-<span class="source-line-no">380</span><span id="line-380"> scan = new Scan().withStartRow(FIRST_ROW);</span>
-<span class="source-line-no">381</span><span id="line-381"> for (int ii = 0; ii < EXPLICIT_COLS.length; ii++) {</span>
-<span class="source-line-no">382</span><span id="line-382"> scan.addColumn(COLS[0], EXPLICIT_COLS[ii]);</span>
-<span class="source-line-no">383</span><span id="line-383"> }</span>
-<span class="source-line-no">384</span><span id="line-384"> scanner = region.getScanner(scan);</span>
-<span class="source-line-no">385</span><span id="line-385"> while (scanner.next(results)) {</span>
-<span class="source-line-no">386</span><span id="line-386"> assertTrue(</span>
-<span class="source-line-no">387</span><span id="line-387"> hasColumn(results, HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));</span>
-<span class="source-line-no">388</span><span id="line-388"> byte[] val = CellUtil.cloneValue(</span>
-<span class="source-line-no">389</span><span id="line-389"> getColumn(results, HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));</span>
-<span class="source-line-no">390</span><span id="line-390"> validateRegionInfo(val);</span>
-<span class="source-line-no">391</span><span id="line-391"> if (validateStartcode) {</span>
-<span class="source-line-no">392</span><span id="line-392"> // assertTrue(hasColumn(results, HConstants.CATALOG_FAMILY,</span>
-<span class="source-line-no">393</span><span id="line-393"> // HConstants.STARTCODE_QUALIFIER));</span>
-<span class="source-line-no">394</span><span id="line-394"> // val = getColumn(results, HConstants.CATALOG_FAMILY,</span>
-<span class="source-line-no">395</span><span id="line-395"> // HConstants.STARTCODE_QUALIFIER).getValue();</span>
-<span class="source-line-no">396</span><span id="line-396"> assertNotNull(val);</span>
-<span class="source-line-no">397</span><span id="line-397"> assertFalse(val.length == 0);</span>
-<span class="source-line-no">398</span><span id="line-398"> long startCode = Bytes.toLong(val);</span>
-<span class="source-line-no">399</span><span id="line-399"> assertEquals(START_CODE, startCode);</span>
-<span class="source-line-no">400</span><span id="line-400"> }</span>
-<span class="source-line-no">401</span><span id="line-401"></span>
-<span class="source-line-no">402</span><span id="line-402"> if (serverName != null) {</span>
-<span class="source-line-no">403</span><span id="line-403"> assertTrue(hasColumn(results, HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER));</span>
-<span class="source-line-no">404</span><span id="line-404"> val = CellUtil.cloneValue(</span>
-<span class="source-line-no">405</span><span id="line-405"> getColumn(results, HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER));</span>
-<span class="source-line-no">406</span><span id="line-406"> assertNotNull(val);</span>
-<span class="source-line-no">407</span><span id="line-407"> assertFalse(val.length == 0);</span>
-<span class="source-line-no">408</span><span id="line-408"> String server = Bytes.toString(val);</span>
-<span class="source-line-no">409</span><span id="line-409"> assertEquals(0, server.compareTo(serverName));</span>
-<span class="source-line-no">410</span><span id="line-410"> }</span>
-<span class="source-line-no">411</span><span id="line-411"> }</span>
-<span class="source-line-no">412</span><span id="line-412"> } finally {</span>
-<span class="source-line-no">413</span><span id="line-413"> InternalScanner s = scanner;</span>
-<span class="source-line-no">414</span><span id="line-414"> scanner = null;</span>
-<span class="source-line-no">415</span><span id="line-415"> if (s != null) {</span>
-<span class="source-line-no">416</span><span id="line-416"> s.close();</span>
-<span class="source-line-no">417</span><span id="line-417"> }</span>
-<span class="source-line-no">418</span><span id="line-418"> }</span>
-<span class="source-line-no">419</span><span id="line-419"> }</span>
+<span class="source-line-no">352</span><span id="line-352"> /** Compare the HRegionInfo we read from HBase to what we stored */</span>
+<span class="source-line-no">353</span><span id="line-353"> private void validateRegionInfo(byte[] regionBytes) throws IOException {</span>
+<span class="source-line-no">354</span><span id="line-354"> RegionInfo info = RegionInfo.parseFromOrNull(regionBytes);</span>
+<span class="source-line-no">355</span><span id="line-355"></span>
+<span class="source-line-no">356</span><span id="line-356"> assertEquals(REGION_INFO.getRegionId(), info.getRegionId());</span>
+<span class="source-line-no">357</span><span id="line-357"> assertEquals(0, info.getStartKey().length);</span>
+<span class="source-line-no">358</span><span id="line-358"> assertEquals(0, info.getEndKey().length);</span>
+<span class="source-line-no">359</span><span id="line-359"> assertEquals(0, Bytes.compareTo(info.getRegionName(), REGION_INFO.getRegionName()));</span>
+<span class="source-line-no">360</span><span id="line-360"> // assertEquals(0, info.getTableDesc().compareTo(REGION_INFO.getTableDesc()));</span>
+<span class="source-line-no">361</span><span id="line-361"> }</span>
+<span class="source-line-no">362</span><span id="line-362"></span>
+<span class="source-line-no">363</span><span id="line-363"> /** Use a scanner to get the region info and then validate the results */</span>
+<span class="source-line-no">364</span><span id="line-364"> private void scan(boolean validateStartcode, String serverName) throws IOException {</span>
+<span class="source-line-no">365</span><span id="line-365"> InternalScanner scanner = null;</span>
+<span class="source-line-no">366</span><span id="line-366"> Scan scan = null;</span>
+<span class="source-line-no">367</span><span id="line-367"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">368</span><span id="line-368"> byte[][][] scanColumns = { COLS, EXPLICIT_COLS };</span>
+<span class="source-line-no">369</span><span id="line-369"> for (int i = 0; i < scanColumns.length; i++) {</span>
+<span class="source-line-no">370</span><span id="line-370"> try {</span>
+<span class="source-line-no">371</span><span id="line-371"> scan = new Scan().withStartRow(FIRST_ROW);</span>
+<span class="source-line-no">372</span><span id="line-372"> for (int ii = 0; ii < EXPLICIT_COLS.length; ii++) {</span>
+<span class="source-line-no">373</span><span id="line-373"> scan.addColumn(COLS[0], EXPLICIT_COLS[ii]);</span>
+<span class="source-line-no">374</span><span id="line-374"> }</span>
+<span class="source-line-no">375</span><span id="line-375"> scanner = region.getScanner(scan);</span>
+<span class="source-line-no">376</span><span id="line-376"> while (scanner.next(results)) {</span>
+<span class="source-line-no">377</span><span id="line-377"> assertTrue(</span>
+<span class="source-line-no">378</span><span id="line-378"> hasColumn(results, HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));</span>
+<span class="source-line-no">379</span><span id="line-379"> byte[] val = CellUtil.cloneValue(</span>
+<span class="source-line-no">380</span><span id="line-380"> getColumn(results, HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));</span>
+<span class="source-line-no">381</span><span id="line-381"> validateRegionInfo(val);</span>
+<span class="source-line-no">382</span><span id="line-382"> if (validateStartcode) {</span>
+<span class="source-line-no">383</span><span id="line-383"> // assertTrue(hasColumn(results, HConstants.CATALOG_FAMILY,</span>
+<span class="source-line-no">384</span><span id="line-384"> // HConstants.STARTCODE_QUALIFIER));</span>
+<span class="source-line-no">385</span><span id="line-385"> // val = getColumn(results, HConstants.CATALOG_FAMILY,</span>
+<span class="source-line-no">386</span><span id="line-386"> // HConstants.STARTCODE_QUALIFIER).getValue();</span>
+<span class="source-line-no">387</span><span id="line-387"> assertNotNull(val);</span>
+<span class="source-line-no">388</span><span id="line-388"> assertFalse(val.length == 0);</span>
+<span class="source-line-no">389</span><span id="line-389"> long startCode = Bytes.toLong(val);</span>
+<span class="source-line-no">390</span><span id="line-390"> assertEquals(START_CODE, startCode);</span>
+<span class="source-line-no">391</span><span id="line-391"> }</span>
+<span class="source-line-no">392</span><span id="line-392"></span>
+<span class="source-line-no">393</span><span id="line-393"> if (serverName != null) {</span>
+<span class="source-line-no">394</span><span id="line-394"> assertTrue(hasColumn(results, HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER));</span>
+<span class="source-line-no">395</span><span id="line-395"> val = CellUtil.cloneValue(</span>
+<span class="source-line-no">396</span><span id="line-396"> getColumn(results, HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER));</span>
+<span class="source-line-no">397</span><span id="line-397"> assertNotNull(val);</span>
+<span class="source-line-no">398</span><span id="line-398"> assertFalse(val.length == 0);</span>
+<span class="source-line-no">399</span><span id="line-399"> String server = Bytes.toString(val);</span>
+<span class="source-line-no">400</span><span id="line-400"> assertEquals(0, server.compareTo(serverName));</span>
+<span class="source-line-no">401</span><span id="line-401"> }</span>
+<span class="source-line-no">402</span><span id="line-402"> }</span>
+<span class="source-line-no">403</span><span id="line-403"> } finally {</span>
+<span class="source-line-no">404</span><span id="line-404"> InternalScanner s = scanner;</span>
+<span class="source-line-no">405</span><span id="line-405"> scanner = null;</span>
+<span class="source-line-no">406</span><span id="line-406"> if (s != null) {</span>
+<span class="source-line-no">407</span><span id="line-407"> s.close();</span>
+<span class="source-line-no">408</span><span id="line-408"> }</span>
+<span class="source-line-no">409</span><span id="line-409"> }</span>
+<span class="source-line-no">410</span><span id="line-410"> }</span>
+<span class="source-line-no">411</span><span id="line-411"> }</span>
+<span class="source-line-no">412</span><span id="line-412"></span>
+<span class="source-line-no">413</span><span id="line-413"> private boolean hasColumn(final List<Cell> kvs, final byte[] family, final byte[] qualifier) {</span>
+<span class="source-line-no">414</span><span id="line-414"> for (Cell kv : kvs) {</span>
+<span class="source-line-no">415</span><span id="line-415"> if (CellUtil.matchingFamily(kv, family) && CellUtil.matchingQualifier(kv, qualifier)) {</span>
+<span class="source-line-no">416</span><span id="line-416"> return true;</span>
+<span class="source-line-no">417</span><span id="line-417"> }</span>
+<span class="source-line-no">418</span><span id="line-418"> }</span>
+<span class="source-line-no">419</span><span id="line-419"> return false;</span>
<span class="source-line-no">420</span><span id="line-420"> }</span>
<span class="source-line-no">421</span><span id="line-421"></span>
-<span class="source-line-no">422</span><span id="line-422"> private boolean hasColumn(final List<Cell> kvs, final byte[] family, final byte[] qualifier) {</span>
+<span class="source-line-no">422</span><span id="line-422"> private Cell getColumn(final List<Cell> kvs, final byte[] family, final byte[] qualifier) {</span>
<span class="source-line-no">423</span><span id="line-423"> for (Cell kv : kvs) {</span>
<span class="source-line-no">424</span><span id="line-424"> if (CellUtil.matchingFamily(kv, family) && CellUtil.matchingQualifier(kv, qualifier)) {</span>
-<span class="source-line-no">425</span><span id="line-425"> return true;</span>
+<span class="source-line-no">425</span><span id="line-425"> return kv;</span>
<span class="source-line-no">426</span><span id="line-426"> }</span>
<span class="source-line-no">427</span><span id="line-427"> }</span>
-<span class="source-line-no">428</span><span id="line-428"> return false;</span>
+<span class="source-line-no">428</span><span id="line-428"> return null;</span>
<span class="source-line-no">429</span><span id="line-429"> }</span>
<span class="source-line-no">430</span><span id="line-430"></span>
-<span class="source-line-no">431</span><span id="line-431"> private Cell getColumn(final List<Cell> kvs, final byte[] family, final byte[] qualifier) {</span>
-<span class="source-line-no">432</span><span id="line-432"> for (Cell kv : kvs) {</span>
-<span class="source-line-no">433</span><span id="line-433"> if (CellUtil.matchingFamily(kv, family) && CellUtil.matchingQualifier(kv, qualifier)) {</span>
-<span class="source-line-no">434</span><span id="line-434"> return kv;</span>
-<span class="source-line-no">435</span><span id="line-435"> }</span>
-<span class="source-line-no">436</span><span id="line-436"> }</span>
-<span class="source-line-no">437</span><span id="line-437"> return null;</span>
+<span class="source-line-no">431</span><span id="line-431"> /** Use get to retrieve the HRegionInfo and validate it */</span>
+<span class="source-line-no">432</span><span id="line-432"> private void getRegionInfo(Table table) throws IOException {</span>
+<span class="source-line-no">433</span><span id="line-433"> Get get = new Get(ROW_KEY);</span>
+<span class="source-line-no">434</span><span id="line-434"> get.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);</span>
+<span class="source-line-no">435</span><span id="line-435"> Result result = table.get(get);</span>
+<span class="source-line-no">436</span><span id="line-436"> byte[] bytes = result.value();</span>
+<span class="source-line-no">437</span><span id="line-437"> validateRegionInfo(bytes);</span>
<span class="source-line-no">438</span><span id="line-438"> }</span>
<span class="source-line-no">439</span><span id="line-439"></span>
-<span class="source-line-no">440</span><span id="line-440"> /** Use get to retrieve the HRegionInfo and validate it */</span>
-<span class="source-line-no">441</span><span id="line-441"> private void getRegionInfo(Table table) throws IOException {</span>
-<span class="source-line-no">442</span><span id="line-442"> Get get = new Get(ROW_KEY);</span>
-<span class="source-line-no">443</span><span id="line-443"> get.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);</span>
-<span class="source-line-no">444</span><span id="line-444"> Result result = table.get(get);</span>
-<span class="source-line-no">445</span><span id="line-445"> byte[] bytes = result.value();</span>
-<span class="source-line-no">446</span><span id="line-446"> validateRegionInfo(bytes);</span>
-<span class="source-line-no">447</span><span id="line-447"> }</span>
-<span class="source-line-no">448</span><span id="line-448"></span>
-<span class="source-line-no">449</span><span id="line-449"> /**</span>
-<span class="source-line-no">450</span><span id="line-450"> * Tests to do a sync flush during the middle of a scan. This is testing the StoreScanner update</span>
-<span class="source-line-no">451</span><span id="line-451"> * readers code essentially. This is not highly concurrent, since its all 1 thread. HBase-910.</span>
-<span class="source-line-no">452</span><span id="line-452"> */</span>
-<span class="source-line-no">453</span><span id="line-453"> @Test</span>
-<span class="source-line-no">454</span><span id="line-454"> public void testScanAndSyncFlush() throws Exception {</span>
-<span class="source-line-no">455</span><span id="line-455"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
-<span class="source-line-no">456</span><span id="line-456"> Table hri = new RegionAsTable(region);</span>
-<span class="source-line-no">457</span><span id="line-457"> try {</span>
-<span class="source-line-no">458</span><span id="line-458"> LOG.info("Added: " + HTestConst.addContent(hri, Bytes.toString(HConstants.CATALOG_FAMILY),</span>
-<span class="source-line-no">459</span><span id="line-459"> Bytes.toString(HConstants.REGIONINFO_QUALIFIER)));</span>
-<span class="source-line-no">460</span><span id="line-460"> int count = count(hri, -1, false);</span>
-<span class="source-line-no">461</span><span id="line-461"> assertEquals(count, count(hri, 100, false)); // do a sync flush.</span>
-<span class="source-line-no">462</span><span id="line-462"> } catch (Exception e) {</span>
-<span class="source-line-no">463</span><span id="line-463"> LOG.error("Failed", e);</span>
-<span class="source-line-no">464</span><span id="line-464"> throw e;</span>
-<span class="source-line-no">465</span><span id="line-465"> } finally {</span>
-<span class="source-line-no">466</span><span id="line-466"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">467</span><span id="line-467"> }</span>
-<span class="source-line-no">468</span><span id="line-468"> }</span>
-<span class="source-line-no">469</span><span id="line-469"></span>
-<span class="source-line-no">470</span><span id="line-470"> /**</span>
-<span class="source-line-no">471</span><span id="line-471"> * Tests to do a concurrent flush (using a 2nd thread) while scanning. This tests both the</span>
-<span class="source-line-no">472</span><span id="line-472"> * StoreScanner update readers and the transition from memstore -> snapshot -> store file.</span>
-<span class="source-line-no">473</span><span id="line-473"> */</span>
-<span class="source-line-no">474</span><span id="line-474"> @Test</span>
-<span class="source-line-no">475</span><span id="line-475"> public void testScanAndRealConcurrentFlush() throws Exception {</span>
-<span class="source-line-no">476</span><span id="line-476"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
-<span class="source-line-no">477</span><span id="line-477"> Table hri = new RegionAsTable(region);</span>
-<span class="source-line-no">478</span><span id="line-478"> try {</span>
-<span class="source-line-no">479</span><span id="line-479"> LOG.info("Added: " + HTestConst.addContent(hri, Bytes.toString(HConstants.CATALOG_FAMILY),</span>
-<span class="source-line-no">480</span><span id="line-480"> Bytes.toString(HConstants.REGIONINFO_QUALIFIER)));</span>
-<span class="source-line-no">481</span><span id="line-481"> int count = count(hri, -1, false);</span>
-<span class="source-line-no">482</span><span id="line-482"> assertEquals(count, count(hri, 100, true)); // do a true concurrent background thread flush</span>
-<span class="source-line-no">483</span><span id="line-483"> } catch (Exception e) {</span>
-<span class="source-line-no">484</span><span id="line-484"> LOG.error("Failed", e);</span>
-<span class="source-line-no">485</span><span id="line-485"> throw e;</span>
-<span class="source-line-no">486</span><span id="line-486"> } finally {</span>
-<span class="source-line-no">487</span><span id="line-487"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">488</span><span id="line-488"> }</span>
-<span class="source-line-no">489</span><span id="line-489"> }</span>
-<span class="source-line-no">490</span><span id="line-490"></span>
-<span class="source-line-no">491</span><span id="line-491"> /**</span>
-<span class="source-line-no">492</span><span id="line-492"> * Make sure scanner returns correct result when we run a major compaction with deletes.</span>
-<span class="source-line-no">493</span><span id="line-493"> */</span>
-<span class="source-line-no">494</span><span id="line-494"> @Test</span>
-<span class="source-line-no">495</span><span id="line-495"> public void testScanAndConcurrentMajorCompact() throws Exception {</span>
-<span class="source-line-no">496</span><span id="line-496"> TableDescriptor htd = TEST_UTIL.createTableDescriptor(TableName.valueOf(name.getMethodName()),</span>
-<span class="source-line-no">497</span><span id="line-497"> ColumnFamilyDescriptorBuilder.DEFAULT_MIN_VERSIONS, 3, HConstants.FOREVER,</span>
-<span class="source-line-no">498</span><span id="line-498"> ColumnFamilyDescriptorBuilder.DEFAULT_KEEP_DELETED);</span>
-<span class="source-line-no">499</span><span id="line-499"> this.region = TEST_UTIL.createLocalHRegion(htd, null, null);</span>
-<span class="source-line-no">500</span><span id="line-500"> Table hri = new RegionAsTable(region);</span>
-<span class="source-line-no">501</span><span id="line-501"></span>
-<span class="source-line-no">502</span><span id="line-502"> try {</span>
-<span class="source-line-no">503</span><span id="line-503"> HTestConst.addContent(hri, Bytes.toString(fam1), Bytes.toString(col1), firstRowBytes,</span>
-<span class="source-line-no">504</span><span id="line-504"> secondRowBytes);</span>
-<span class="source-line-no">505</span><span id="line-505"> HTestConst.addContent(hri, Bytes.toString(fam2), Bytes.toString(col1), firstRowBytes,</span>
-<span class="source-line-no">506</span><span id="line-506"> secondRowBytes);</span>
-<span class="source-line-no">507</span><span id="line-507"></span>
-<span class="source-line-no">508</span><span id="line-508"> Delete dc = new Delete(firstRowBytes);</span>
-<span class="source-line-no">509</span><span id="line-509"> /* delete column1 of firstRow */</span>
-<span class="source-line-no">510</span><span id="line-510"> dc.addColumns(fam1, col1);</span>
-<span class="source-line-no">511</span><span id="line-511"> region.delete(dc);</span>
-<span class="source-line-no">512</span><span id="line-512"> region.flush(true);</span>
-<span class="source-line-no">513</span><span id="line-513"></span>
-<span class="source-line-no">514</span><span id="line-514"> HTestConst.addContent(hri, Bytes.toString(fam1), Bytes.toString(col1), secondRowBytes,</span>
-<span class="source-line-no">515</span><span id="line-515"> thirdRowBytes);</span>
-<span class="source-line-no">516</span><span id="line-516"> HTestConst.addContent(hri, Bytes.toString(fam2), Bytes.toString(col1), secondRowBytes,</span>
-<span class="source-line-no">517</span><span id="line-517"> thirdRowBytes);</span>
-<span class="source-line-no">518</span><span id="line-518"> region.flush(true);</span>
-<span class="source-line-no">519</span><span id="line-519"></span>
-<span class="source-line-no">520</span><span id="line-520"> InternalScanner s = region.getScanner(new Scan());</span>
-<span class="source-line-no">521</span><span id="line-521"> // run a major compact, column1 of firstRow will be cleaned.</span>
-<span class="source-line-no">522</span><span id="line-522"> region.compact(true);</span>
+<span class="source-line-no">440</span><span id="line-440"> /**</span>
+<span class="source-line-no">441</span><span id="line-441"> * Tests to do a sync flush during the middle of a scan. This is testing the StoreScanner update</span>
+<span class="source-line-no">442</span><span id="line-442"> * readers code essentially. This is not highly concurrent, since its all 1 thread. HBase-910.</span>
+<span class="source-line-no">443</span><span id="line-443"> */</span>
+<span class="source-line-no">444</span><span id="line-444"> @Test</span>
+<span class="source-line-no">445</span><span id="line-445"> public void testScanAndSyncFlush() throws Exception {</span>
+<span class="source-line-no">446</span><span id="line-446"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
+<span class="source-line-no">447</span><span id="line-447"> Table hri = new RegionAsTable(region);</span>
+<span class="source-line-no">448</span><span id="line-448"> try {</span>
+<span class="source-line-no">449</span><span id="line-449"> LOG.info("Added: " + HTestConst.addContent(hri, Bytes.toString(HConstants.CATALOG_FAMILY),</span>
+<span class="source-line-no">450</span><span id="line-450"> Bytes.toString(HConstants.REGIONINFO_QUALIFIER)));</span>
+<span class="source-line-no">451</span><span id="line-451"> int count = count(hri, -1, false);</span>
+<span class="source-line-no">452</span><span id="line-452"> assertEquals(count, count(hri, 100, false)); // do a sync flush.</span>
+<span class="source-line-no">453</span><span id="line-453"> } catch (Exception e) {</span>
+<span class="source-line-no">454</span><span id="line-454"> LOG.error("Failed", e);</span>
+<span class="source-line-no">455</span><span id="line-455"> throw e;</span>
+<span class="source-line-no">456</span><span id="line-456"> } finally {</span>
+<span class="source-line-no">457</span><span id="line-457"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">458</span><span id="line-458"> }</span>
+<span class="source-line-no">459</span><span id="line-459"> }</span>
+<span class="source-line-no">460</span><span id="line-460"></span>
+<span class="source-line-no">461</span><span id="line-461"> /**</span>
+<span class="source-line-no">462</span><span id="line-462"> * Tests to do a concurrent flush (using a 2nd thread) while scanning. This tests both the</span>
+<span class="source-line-no">463</span><span id="line-463"> * StoreScanner update readers and the transition from memstore -> snapshot -> store file.</span>
+<span class="source-line-no">464</span><span id="line-464"> */</span>
+<span class="source-line-no">465</span><span id="line-465"> @Test</span>
+<span class="source-line-no">466</span><span id="line-466"> public void testScanAndRealConcurrentFlush() throws Exception {</span>
+<span class="source-line-no">467</span><span id="line-467"> this.region = TEST_UTIL.createLocalHRegion(TESTTABLEDESC, null, null);</span>
+<span class="source-line-no">468</span><span id="line-468"> Table hri = new RegionAsTable(region);</span>
+<span class="source-line-no">469</span><span id="line-469"> try {</span>
+<span class="source-line-no">470</span><span id="line-470"> LOG.info("Added: " + HTestConst.addContent(hri, Bytes.toString(HConstants.CATALOG_FAMILY),</span>
+<span class="source-line-no">471</span><span id="line-471"> Bytes.toString(HConstants.REGIONINFO_QUALIFIER)));</span>
+<span class="source-line-no">472</span><span id="line-472"> int count = count(hri, -1, false);</span>
+<span class="source-line-no">473</span><span id="line-473"> assertEquals(count, count(hri, 100, true)); // do a true concurrent background thread flush</span>
+<span class="source-line-no">474</span><span id="line-474"> } catch (Exception e) {</span>
+<span class="source-line-no">475</span><span id="line-475"> LOG.error("Failed", e);</span>
+<span class="source-line-no">476</span><span id="line-476"> throw e;</span>
+<span class="source-line-no">477</span><span id="line-477"> } finally {</span>
+<span class="source-line-no">478</span><span id="line-478"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">479</span><span id="line-479"> }</span>
+<span class="source-line-no">480</span><span id="line-480"> }</span>
+<span class="source-line-no">481</span><span id="line-481"></span>
+<span class="source-line-no">482</span><span id="line-482"> /**</span>
+<span class="source-line-no">483</span><span id="line-483"> * Make sure scanner returns correct result when we run a major compaction with deletes.</span>
+<span class="source-line-no">484</span><span id="line-484"> */</span>
+<span class="source-line-no">485</span><span id="line-485"> @Test</span>
+<span class="source-line-no">486</span><span id="line-486"> public void testScanAndConcurrentMajorCompact(TestInfo testInfo) throws Exception {</span>
+<span class="source-line-no">487</span><span id="line-487"> TableDescriptor htd =</span>
+<span class="source-line-no">488</span><span id="line-488"> TEST_UTIL.createTableDescriptor(TableName.valueOf(testInfo.getTestMethod().get().getName()),</span>
+<span class="source-line-no">489</span><span id="line-489"> ColumnFamilyDescriptorBuilder.DEFAULT_MIN_VERSIONS, 3, HConstants.FOREVER,</span>
+<span class="source-line-no">490</span><span id="line-490"> ColumnFamilyDescriptorBuilder.DEFAULT_KEEP_DELETED);</span>
+<span class="source-line-no">491</span><span id="line-491"> this.region = TEST_UTIL.createLocalHRegion(htd, null, null);</span>
+<span class="source-line-no">492</span><span id="line-492"> Table hri = new RegionAsTable(region);</span>
+<span class="source-line-no">493</span><span id="line-493"></span>
+<span class="source-line-no">494</span><span id="line-494"> try {</span>
+<span class="source-line-no">495</span><span id="line-495"> HTestConst.addContent(hri, Bytes.toString(fam1), Bytes.toString(col1), firstRowBytes,</span>
+<span class="source-line-no">496</span><span id="line-496"> secondRowBytes);</span>
+<span class="source-line-no">497</span><span id="line-497"> HTestConst.addContent(hri, Bytes.toString(fam2), Bytes.toString(col1), firstRowBytes,</span>
+<span class="source-line-no">498</span><span id="line-498"> secondRowBytes);</span>
+<span class="source-line-no">499</span><span id="line-499"></span>
+<span class="source-line-no">500</span><span id="line-500"> Delete dc = new Delete(firstRowBytes);</span>
+<span class="source-line-no">501</span><span id="line-501"> /* delete column1 of firstRow */</span>
+<span class="source-line-no">502</span><span id="line-502"> dc.addColumns(fam1, col1);</span>
+<span class="source-line-no">503</span><span id="line-503"> region.delete(dc);</span>
+<span class="source-line-no">504</span><span id="line-504"> region.flush(true);</span>
+<span class="source-line-no">505</span><span id="line-505"></span>
+<span class="source-line-no">506</span><span id="line-506"> HTestConst.addContent(hri, Bytes.toString(fam1), Bytes.toString(col1), secondRowBytes,</span>
+<span class="source-line-no">507</span><span id="line-507"> thirdRowBytes);</span>
+<span class="source-line-no">508</span><span id="line-508"> HTestConst.addContent(hri, Bytes.toString(fam2), Bytes.toString(col1), secondRowBytes,</span>
+<span class="source-line-no">509</span><span id="line-509"> thirdRowBytes);</span>
+<span class="source-line-no">510</span><span id="line-510"> region.flush(true);</span>
+<span class="source-line-no">511</span><span id="line-511"></span>
+<span class="source-line-no">512</span><span id="line-512"> InternalScanner s = region.getScanner(new Scan());</span>
+<span class="source-line-no">513</span><span id="line-513"> // run a major compact, column1 of firstRow will be cleaned.</span>
+<span class="source-line-no">514</span><span id="line-514"> region.compact(true);</span>
+<span class="source-line-no">515</span><span id="line-515"></span>
+<span class="source-line-no">516</span><span id="line-516"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">517</span><span id="line-517"> s.next(results);</span>
+<span class="source-line-no">518</span><span id="line-518"></span>
+<span class="source-line-no">519</span><span id="line-519"> // make sure returns column2 of firstRow</span>
+<span class="source-line-no">520</span><span id="line-520"> assertEquals(1, results.size(), "result is not correct, keyValues : " + results);</span>
+<span class="source-line-no">521</span><span id="line-521"> assertTrue(CellUtil.matchingRows(results.get(0), firstRowBytes));</span>
+<span class="source-line-no">522</span><span id="line-522"> assertTrue(CellUtil.matchingFamily(results.get(0), fam2));</span>
<span class="source-line-no">523</span><span id="line-523"></span>
-<span class="source-line-no">524</span><span id="line-524"> List<Cell> results = new ArrayList<>();</span>
+<span class="source-line-no">524</span><span id="line-524"> results = new ArrayList<>();</span>
<span class="source-line-no">525</span><span id="line-525"> s.next(results);</span>
<span class="source-line-no">526</span><span id="line-526"></span>
-<span class="source-line-no">527</span><span id="line-527"> // make sure returns column2 of firstRow</span>
-<span class="source-line-no">528</span><span id="line-528"> assertTrue("result is not correct, keyValues : " + results, results.size() == 1);</span>
-<span class="source-line-no">529</span><span id="line-529"> assertTrue(CellUtil.matchingRows(results.get(0), firstRowBytes));</span>
-<span class="source-line-no">530</span><span id="line-530"> assertTrue(CellUtil.matchingFamily(results.get(0), fam2));</span>
-<span class="source-line-no">531</span><span id="line-531"></span>
-<span class="source-line-no">532</span><span id="line-532"> results = new ArrayList<>();</span>
-<span class="source-line-no">533</span><span id="line-533"> s.next(results);</span>
-<span class="source-line-no">534</span><span id="line-534"></span>
-<span class="source-line-no">535</span><span id="line-535"> // get secondRow</span>
-<span class="source-line-no">536</span><span id="line-536"> assertTrue(results.size() == 2);</span>
-<span class="source-line-no">537</span><span id="line-537"> assertTrue(CellUtil.matchingRows(results.get(0), secondRowBytes));</span>
-<span class="source-line-no">538</span><span id="line-538"> assertTrue(CellUtil.matchingFamily(results.get(0), fam1));</span>
-<span class="source-line-no">539</span><span id="line-539"> assertTrue(CellUtil.matchingFamily(results.get(1), fam2));</span>
-<span class="source-line-no">540</span><span id="line-540"> } finally {</span>
-<span class="source-line-no">541</span><span id="line-541"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
-<span class="source-line-no">542</span><span id="line-542"> }</span>
-<span class="source-line-no">543</span><span id="line-543"> }</span>
-<span class="source-line-no">544</span><span id="line-544"></span>
-<span class="source-line-no">545</span><span id="line-545"> /**</span>
-<span class="source-line-no">546</span><span id="line-546"> * Count table.</span>
-<span class="source-line-no">547</span><span id="line-547"> * @param hri Region</span>
-<span class="source-line-no">548</span><span id="line-548"> * @param flushIndex At what row we start the flush.</span>
-<span class="source-line-no">549</span><span id="line-549"> * @param concurrent if the flush should be concurrent or sync.</span>
-<span class="source-line-no">550</span><span id="line-550"> * @return Count of rows found.</span>
-<span class="source-line-no">551</span><span id="line-551"> */</span>
-<span class="source-line-no">552</span><span id="line-552"> private int count(final Table countTable, final int flushIndex, boolean concurrent)</span>
-<span class="source-line-no">553</span><span id="line-553"> throws Exception {</span>
-<span class="source-line-no">554</span><span id="line-554"> LOG.info("Taking out counting scan");</span>
-<span class="source-line-no">555</span><span id="line-555"> Scan scan = new Scan();</span>
-<span class="source-line-no">556</span><span id="line-556"> for (byte[] qualifier : EXPLICIT_COLS) {</span>
-<span class="source-line-no">557</span><span id="line-557"> scan.addColumn(HConstants.CATALOG_FAMILY, qualifier);</span>
-<span class="source-line-no">558</span><span id="line-558"> }</span>
-<span class="source-line-no">559</span><span id="line-559"> ResultScanner s = countTable.getScanner(scan);</span>
-<span class="source-line-no">560</span><span id="line-560"> int count = 0;</span>
-<span class="source-line-no">561</span><span id="line-561"> boolean justFlushed = false;</span>
-<span class="source-line-no">562</span><span id="line-562"> while (s.next() != null) {</span>
-<span class="source-line-no">563</span><span id="line-563"> if (justFlushed) {</span>
-<span class="source-line-no">564</span><span id="line-564"> LOG.info("after next() just after next flush");</span>
-<span class="source-line-no">565</span><span id="line-565"> justFlushed = false;</span>
-<span class="source-line-no">566</span><span id="line-566"> }</span>
-<span class="source-line-no">567</span><span id="line-567"> count++;</span>
-<span class="source-line-no">568</span><span id="line-568"> if (flushIndex == count) {</span>
-<span class="source-line-no">569</span><span id="line-569"> LOG.info("Starting flush at flush index " + flushIndex);</span>
-<span class="source-line-no">570</span><span id="line-570"> Thread t = new Thread() {</span>
-<span class="source-line-no">571</span><span id="line-571"> @Override</span>
-<span class="source-line-no">572</span><span id="line-572"> public void run() {</span>
-<span class="source-line-no">573</span><span id="line-573"> try {</span>
-<span class="source-line-no">574</span><span id="line-574"> region.flush(true);</span>
-<span class="source-line-no">575</span><span id="line-575"> LOG.info("Finishing flush");</span>
-<span class="source-line-no">576</span><span id="line-576"> } catch (IOException e) {</span>
-<span class="source-line-no">577</span><span id="line-577"> LOG.info("Failed flush cache");</span>
-<span class="source-line-no">578</span><span id="line-578"> }</span>
-<span class="source-line-no">579</span><span id="line-579"> }</span>
-<span class="source-line-no">580</span><span id="line-580"> };</span>
-<span class="source-line-no">581</span><span id="line-581"> t.start();</span>
-<span class="source-line-no">582</span><span id="line-582"> if (!concurrent) {</span>
-<span class="source-line-no">583</span><span id="line-583"> // sync flush</span>
-<span class="source-line-no">584</span><span id="line-584"> t.join();</span>
-<span class="source-line-no">585</span><span id="line-585"> }</span>
-<span class="source-line-no">586</span><span id="line-586"> LOG.info("Continuing on after kicking off background flush");</span>
-<span class="source-line-no">587</span><span id="line-587"> justFlushed = true;</span>
-<span class="source-line-no">588</span><span id="line-588"> }</span>
-<span class="source-line-no">589</span><span id="line-589"> }</span>
-<span class="source-line-no">590</span><span id="line-590"> s.close();</span>
-<span class="source-line-no">591</span><span id="line-591"> LOG.info("Found " + count + " items");</span>
-<span class="source-line-no">592</span><span id="line-592"> return count;</span>
-<span class="source-line-no">593</span><span id="line-593"> }</span>
-<span class="source-line-no">594</span><span id="line-594">}</span>
+<span class="source-line-no">527</span><span id="line-527"> // get secondRow</span>
+<span class="source-line-no">528</span><span id="line-528"> assertEquals(2, results.size());</span>
+<span class="source-line-no">529</span><span id="line-529"> assertTrue(CellUtil.matchingRows(results.get(0), secondRowBytes));</span>
+<span class="source-line-no">530</span><span id="line-530"> assertTrue(CellUtil.matchingFamily(results.get(0), fam1));</span>
+<span class="source-line-no">531</span><span id="line-531"> assertTrue(CellUtil.matchingFamily(results.get(1), fam2));</span>
+<span class="source-line-no">532</span><span id="line-532"> } finally {</span>
+<span class="source-line-no">533</span><span id="line-533"> HBaseTestingUtil.closeRegionAndWAL(this.region);</span>
+<span class="source-line-no">534</span><span id="line-534"> }</span>
+<span class="source-line-no">535</span><span id="line-535"> }</span>
+<span class="source-line-no">536</span><span id="line-536"></span>
+<span class="source-line-no">537</span><span id="line-537"> /**</span>
+<span class="source-line-no">538</span><span id="line-538"> * Count table.</span>
+<span class="source-line-no">539</span><span id="line-539"> * @param countTable Table</span>
+<span class="source-line-no">540</span><span id="line-540"> * @param flushIndex At what row we start the flush.</span>
+<span class="source-line-no">541</span><span id="line-541"> * @param concurrent if the flush should be concurrent or sync.</span>
+<span class="source-line-no">542</span><span id="line-542"> * @return Count of rows found.</span>
+<span class="source-line-no">543</span><span id="line-543"> */</span>
+<span class="source-line-no">544</span><span id="line-544"> private int count(final Table countTable, final int flushIndex, boolean concurrent)</span>
+<span class="source-line-no">545</span><span id="line-545"> throws Exception {</span>
+<span class="source-line-no">546</span><span id="line-546"> LOG.info("Taking out counting scan");</span>
+<span class="source-line-no">547</span><span id="line-547"> Scan scan = new Scan();</span>
+<span class="source-line-no">548</span><span id="line-548"> for (byte[] qualifier : EXPLICIT_COLS) {</span>
+<span class="source-line-no">549</span><span id="line-549"> scan.addColumn(HConstants.CATALOG_FAMILY, qualifier);</span>
+<span class="source-line-no">550</span><span id="line-550"> }</span>
+<span class="source-line-no">551</span><span id="line-551"> ResultScanner s = countTable.getScanner(scan);</span>
+<span class="source-line-no">552</span><span id="line-552"> int count = 0;</span>
+<span class="source-line-no">553</span><span id="line-553"> boolean justFlushed = false;</span>
+<span class="source-line-no">554</span><span id="line-554"> while (s.next() != null) {</span>
+<span class="source-line-no">555</span><span id="line-555"> if (justFlushed) {</span>
+<span class="source-line-no">556</span><span id="line-556"> LOG.info("after next() just after next flush");</span>
+<span class="source-line-no">557</span><span id="line-557"> justFlushed = false;</span>
+<span class="source-line-no">558</span><span id="line-558"> }</span>
+<span class="source-line-no">559</span><span id="line-559"> count++;</span>
+<span class="source-line-no">560</span><span id="line-560"> if (flushIndex == count) {</span>
+<span class="source-line-no">561</span><span id="line-561"> LOG.info("Starting flush at flush index " + flushIndex);</span>
+<span class="source-line-no">562</span><span id="line-562"> Thread t = new Thread() {</span>
+<span class="source-line-no">563</span><span id="line-563"> @Override</span>
+<span class="source-line-no">564</span><span id="line-564"> public void run() {</span>
+<span class="source-line-no">565</span><span id="line-565"> try {</span>
+<span class="source-line-no">566</span><span id="line-566"> region.flush(true);</span>
+<span class="source-line-no">567</span><span id="line-567"> LOG.info("Finishing flush");</span>
+<span class="source-line-no">568</span><span id="line-568"> } catch (IOException e) {</span>
+<span class="source-line-no">569</span><span id="line-569"> LOG.info("Failed flush cache");</span>
+<span class="source-line-no">570</span><span id="line-570"> }</span>
+<span class="source-line-no">571</span><span id="line-571"> }</span>
+<span class="source-line-no">572</span><span id="line-572"> };</span>
+<span class="source-line-no">573</span><span id="line-573"> t.start();</span>
+<span class="source-line-no">574</span><span id="line-574"> if (!concurrent) {</span>
+<span class="source-line-no">575</span><span id="line-575"> // sync flush</span>
+<span class="source-line-no">576</span><span id="line-576"> t.join();</span>
+<span class="source-line-no">577</span><span id="line-577"> }</span>
+<span class="source-line-no">578</span><span id="line-578"> LOG.info("Continuing on after kicking off background flush");</span>
+<span class="source-line-no">579</span><span id="line-579"> justFlushed = true;</span>
+<span class="source-line-no">580</span><span id="line-580"> }</span>
+<span class="source-line-no">581</span><span id="line-581"> }</span>
+<span class="source-line-no">582</span><span id="line-582"> s.close();</span>
+<span class="source-line-no">583</span><span id="line-583"> LOG.info("Found " + count + " items");</span>
+<span class="source-line-no">584</span><span id="line-584"> return count;</span>
+<span class="source-line-no">585</span><span id="line-585"> }</span>
+<span class="source-line-no">586</span><span id="line-586">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html
index 42352502012..08103cf7d97 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerBlockSizeLimits.html
@@ -30,9 +30,9 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertFalse;</span>
-<span class="source-line-no">022</span><span id="line-22">import static org.junit.Assert.assertTrue;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertFalse;</span>
+<span class="source-line-no">022</span><span id="line-22">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
<span class="source-line-no">023</span><span id="line-23"></span>
<span class="source-line-no">024</span><span id="line-24">import java.io.IOException;</span>
<span class="source-line-no">025</span><span id="line-25">import java.util.HashSet;</span>
@@ -40,278 +40,272 @@
<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.conf.Configuration;</span>
<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.Cell;</span>
<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.CompareOperator;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.RegionLocator;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.metrics.ScanMetrics;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.filter.BinaryComparator;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.filter.ColumnPaginationFilter;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.filter.QualifierFilter;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.filter.RowFilter;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.filter.SkipFilter;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.junit.Before;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.junit.BeforeClass;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.junit.ClassRule;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.Test;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55">@Category({ LargeTests.class })</span>
-<span class="source-line-no">056</span><span id="line-56">public class TestScannerBlockSizeLimits {</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58"> @ClassRule</span>
-<span class="source-line-no">059</span><span id="line-59"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">060</span><span id="line-60"> HBaseClassTestRule.forClass(TestScannerBlockSizeLimits.class);</span>
-<span class="source-line-no">061</span><span id="line-61"></span>
-<span class="source-line-no">062</span><span id="line-62"> private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">063</span><span id="line-63"> private static final TableName TABLE = TableName.valueOf("TestScannerBlockSizeLimits");</span>
-<span class="source-line-no">064</span><span id="line-64"> private static final byte[] FAMILY1 = Bytes.toBytes("0");</span>
-<span class="source-line-no">065</span><span id="line-65"> private static final byte[] FAMILY2 = Bytes.toBytes("1");</span>
-<span class="source-line-no">066</span><span id="line-66"></span>
-<span class="source-line-no">067</span><span id="line-67"> private static final byte[] DATA = new byte[1000];</span>
-<span class="source-line-no">068</span><span id="line-68"> private static final byte[][] FAMILIES = new byte[][] { FAMILY1, FAMILY2 };</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70"> private static final byte[] COLUMN1 = Bytes.toBytes(0);</span>
-<span class="source-line-no">071</span><span id="line-71"> private static final byte[] COLUMN2 = Bytes.toBytes(1);</span>
-<span class="source-line-no">072</span><span id="line-72"> private static final byte[] COLUMN3 = Bytes.toBytes(2);</span>
-<span class="source-line-no">073</span><span id="line-73"> private static final byte[] COLUMN5 = Bytes.toBytes(5);</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75"> @BeforeClass</span>
-<span class="source-line-no">076</span><span id="line-76"> public static void setUp() throws Exception {</span>
-<span class="source-line-no">077</span><span id="line-77"> Configuration conf = TEST_UTIL.getConfiguration();</span>
-<span class="source-line-no">078</span><span id="line-78"> conf.setInt(HConstants.HBASE_SERVER_SCANNER_MAX_RESULT_SIZE_KEY, 4200);</span>
-<span class="source-line-no">079</span><span id="line-79"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">080</span><span id="line-80"> TEST_UTIL.createTable(TABLE, FAMILIES, 1, 2048);</span>
-<span class="source-line-no">081</span><span id="line-81"> createTestData();</span>
-<span class="source-line-no">082</span><span id="line-82"> }</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84"> @Before</span>
-<span class="source-line-no">085</span><span id="line-85"> public void setupEach() throws Exception {</span>
-<span class="source-line-no">086</span><span id="line-86"> HRegionServer regionServer = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
-<span class="source-line-no">087</span><span id="line-87"> for (HRegion region : regionServer.getRegions(TABLE)) {</span>
-<span class="source-line-no">088</span><span id="line-88"> System.out.println("Clearing cache for region " + region.getRegionInfo().getEncodedName());</span>
-<span class="source-line-no">089</span><span id="line-89"> regionServer.clearRegionBlockCache(region);</span>
-<span class="source-line-no">090</span><span id="line-90"> }</span>
-<span class="source-line-no">091</span><span id="line-91"> }</span>
-<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93"> private static void createTestData() throws IOException, InterruptedException {</span>
-<span class="source-line-no">094</span><span id="line-94"> RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(TABLE);</span>
-<span class="source-line-no">095</span><span id="line-95"> String regionName = locator.getAllRegionLocations().get(0).getRegion().getEncodedName();</span>
-<span class="source-line-no">096</span><span id="line-96"> HRegion region = TEST_UTIL.getRSForFirstRegionInTable(TABLE).getRegion(regionName);</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98"> for (int i = 1; i < 10; i++) {</span>
-<span class="source-line-no">099</span><span id="line-99"> // 5 columns per row, in 2 families</span>
-<span class="source-line-no">100</span><span id="line-100"> // Each column value is 1000 bytes, which is enough to fill a full block with row and header.</span>
-<span class="source-line-no">101</span><span id="line-101"> // So 5 blocks per row in FAMILY1</span>
-<span class="source-line-no">102</span><span id="line-102"> Put put = new Put(Bytes.toBytes(i));</span>
-<span class="source-line-no">103</span><span id="line-103"> for (int j = 0; j < 6; j++) {</span>
-<span class="source-line-no">104</span><span id="line-104"> put.addColumn(FAMILY1, Bytes.toBytes(j), DATA);</span>
-<span class="source-line-no">105</span><span id="line-105"> }</span>
-<span class="source-line-no">106</span><span id="line-106"></span>
-<span class="source-line-no">107</span><span id="line-107"> // Additional block in FAMILY2 (notably smaller than block size)</span>
-<span class="source-line-no">108</span><span id="line-108"> put.addColumn(FAMILY2, COLUMN1, DATA);</span>
-<span class="source-line-no">109</span><span id="line-109"></span>
-<span class="source-line-no">110</span><span id="line-110"> region.put(put);</span>
-<span class="source-line-no">111</span><span id="line-111"></span>
-<span class="source-line-no">112</span><span id="line-112"> if (i % 2 == 0) {</span>
-<span class="source-line-no">113</span><span id="line-113"> region.flush(true);</span>
-<span class="source-line-no">114</span><span id="line-114"> }</span>
-<span class="source-line-no">115</span><span id="line-115"> }</span>
-<span class="source-line-no">116</span><span id="line-116"></span>
-<span class="source-line-no">117</span><span id="line-117"> // we've created 10 storefiles at this point, 5 per family</span>
-<span class="source-line-no">118</span><span id="line-118"> region.flush(true);</span>
-<span class="source-line-no">119</span><span id="line-119"></span>
-<span class="source-line-no">120</span><span id="line-120"> }</span>
-<span class="source-line-no">121</span><span id="line-121"></span>
-<span class="source-line-no">122</span><span id="line-122"> /**</span>
-<span class="source-line-no">123</span><span id="line-123"> * Simplest test that ensures we don't count block sizes too much. These 2 requested cells are in</span>
-<span class="source-line-no">124</span><span id="line-124"> * the same block, so should be returned in 1 request. If we mis-counted blocks, it'd come in 2</span>
-<span class="source-line-no">125</span><span id="line-125"> * requests.</span>
-<span class="source-line-no">126</span><span id="line-126"> */</span>
-<span class="source-line-no">127</span><span id="line-127"> @Test</span>
-<span class="source-line-no">128</span><span id="line-128"> public void testSingleBlock() throws IOException {</span>
-<span class="source-line-no">129</span><span id="line-129"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.RegionLocator;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.metrics.ScanMetrics;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.filter.BinaryComparator;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.filter.ColumnPaginationFilter;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.filter.QualifierFilter;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.filter.RowFilter;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.filter.SkipFilter;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">052</span><span id="line-52"></span>
+<span class="source-line-no">053</span><span id="line-53">@Tag(LargeTests.TAG)</span>
+<span class="source-line-no">054</span><span id="line-54">public class TestScannerBlockSizeLimits {</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56"> private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">057</span><span id="line-57"> private static final TableName TABLE = TableName.valueOf("TestScannerBlockSizeLimits");</span>
+<span class="source-line-no">058</span><span id="line-58"> private static final byte[] FAMILY1 = Bytes.toBytes("0");</span>
+<span class="source-line-no">059</span><span id="line-59"> private static final byte[] FAMILY2 = Bytes.toBytes("1");</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61"> private static final byte[] DATA = new byte[1000];</span>
+<span class="source-line-no">062</span><span id="line-62"> private static final byte[][] FAMILIES = new byte[][] { FAMILY1, FAMILY2 };</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64"> private static final byte[] COLUMN1 = Bytes.toBytes(0);</span>
+<span class="source-line-no">065</span><span id="line-65"> private static final byte[] COLUMN2 = Bytes.toBytes(1);</span>
+<span class="source-line-no">066</span><span id="line-66"> private static final byte[] COLUMN3 = Bytes.toBytes(2);</span>
+<span class="source-line-no">067</span><span id="line-67"> private static final byte[] COLUMN5 = Bytes.toBytes(5);</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69"> @BeforeAll</span>
+<span class="source-line-no">070</span><span id="line-70"> public static void setUp() throws Exception {</span>
+<span class="source-line-no">071</span><span id="line-71"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">072</span><span id="line-72"> conf.setInt(HConstants.HBASE_SERVER_SCANNER_MAX_RESULT_SIZE_KEY, 4200);</span>
+<span class="source-line-no">073</span><span id="line-73"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">074</span><span id="line-74"> TEST_UTIL.createTable(TABLE, FAMILIES, 1, 2048);</span>
+<span class="source-line-no">075</span><span id="line-75"> createTestData();</span>
+<span class="source-line-no">076</span><span id="line-76"> }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78"> @BeforeEach</span>
+<span class="source-line-no">079</span><span id="line-79"> public void setupEach() throws Exception {</span>
+<span class="source-line-no">080</span><span id="line-80"> HRegionServer regionServer = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
+<span class="source-line-no">081</span><span id="line-81"> for (HRegion region : regionServer.getRegions(TABLE)) {</span>
+<span class="source-line-no">082</span><span id="line-82"> System.out.println("Clearing cache for region " + region.getRegionInfo().getEncodedName());</span>
+<span class="source-line-no">083</span><span id="line-83"> regionServer.clearRegionBlockCache(region);</span>
+<span class="source-line-no">084</span><span id="line-84"> }</span>
+<span class="source-line-no">085</span><span id="line-85"> }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87"> private static void createTestData() throws IOException, InterruptedException {</span>
+<span class="source-line-no">088</span><span id="line-88"> RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(TABLE);</span>
+<span class="source-line-no">089</span><span id="line-89"> String regionName = locator.getAllRegionLocations().get(0).getRegion().getEncodedName();</span>
+<span class="source-line-no">090</span><span id="line-90"> HRegion region = TEST_UTIL.getRSForFirstRegionInTable(TABLE).getRegion(regionName);</span>
+<span class="source-line-no">091</span><span id="line-91"></span>
+<span class="source-line-no">092</span><span id="line-92"> for (int i = 1; i < 10; i++) {</span>
+<span class="source-line-no">093</span><span id="line-93"> // 5 columns per row, in 2 families</span>
+<span class="source-line-no">094</span><span id="line-94"> // Each column value is 1000 bytes, which is enough to fill a full block with row and header.</span>
+<span class="source-line-no">095</span><span id="line-95"> // So 5 blocks per row in FAMILY1</span>
+<span class="source-line-no">096</span><span id="line-96"> Put put = new Put(Bytes.toBytes(i));</span>
+<span class="source-line-no">097</span><span id="line-97"> for (int j = 0; j < 6; j++) {</span>
+<span class="source-line-no">098</span><span id="line-98"> put.addColumn(FAMILY1, Bytes.toBytes(j), DATA);</span>
+<span class="source-line-no">099</span><span id="line-99"> }</span>
+<span class="source-line-no">100</span><span id="line-100"></span>
+<span class="source-line-no">101</span><span id="line-101"> // Additional block in FAMILY2 (notably smaller than block size)</span>
+<span class="source-line-no">102</span><span id="line-102"> put.addColumn(FAMILY2, COLUMN1, DATA);</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104"> region.put(put);</span>
+<span class="source-line-no">105</span><span id="line-105"></span>
+<span class="source-line-no">106</span><span id="line-106"> if (i % 2 == 0) {</span>
+<span class="source-line-no">107</span><span id="line-107"> region.flush(true);</span>
+<span class="source-line-no">108</span><span id="line-108"> }</span>
+<span class="source-line-no">109</span><span id="line-109"> }</span>
+<span class="source-line-no">110</span><span id="line-110"></span>
+<span class="source-line-no">111</span><span id="line-111"> // we've created 10 storefiles at this point, 5 per family</span>
+<span class="source-line-no">112</span><span id="line-112"> region.flush(true);</span>
+<span class="source-line-no">113</span><span id="line-113"></span>
+<span class="source-line-no">114</span><span id="line-114"> }</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116"> /**</span>
+<span class="source-line-no">117</span><span id="line-117"> * Simplest test that ensures we don't count block sizes too much. These 2 requested cells are in</span>
+<span class="source-line-no">118</span><span id="line-118"> * the same block, so should be returned in 1 request. If we mis-counted blocks, it'd come in 2</span>
+<span class="source-line-no">119</span><span id="line-119"> * requests.</span>
+<span class="source-line-no">120</span><span id="line-120"> */</span>
+<span class="source-line-no">121</span><span id="line-121"> @Test</span>
+<span class="source-line-no">122</span><span id="line-122"> public void testSingleBlock() throws IOException {</span>
+<span class="source-line-no">123</span><span id="line-123"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">124</span><span id="line-124"></span>
+<span class="source-line-no">125</span><span id="line-125"> ResultScanner scanner =</span>
+<span class="source-line-no">126</span><span id="line-126"> table.getScanner(getBaseScan().withStartRow(Bytes.toBytes(1)).withStopRow(Bytes.toBytes(2))</span>
+<span class="source-line-no">127</span><span id="line-127"> .addColumn(FAMILY1, COLUMN1).addColumn(FAMILY1, COLUMN2).setReadType(Scan.ReadType.STREAM));</span>
+<span class="source-line-no">128</span><span id="line-128"></span>
+<span class="source-line-no">129</span><span id="line-129"> ScanMetrics metrics = scanner.getScanMetrics();</span>
<span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131"> ResultScanner scanner =</span>
-<span class="source-line-no">132</span><span id="line-132"> table.getScanner(getBaseScan().withStartRow(Bytes.toBytes(1)).withStopRow(Bytes.toBytes(2))</span>
-<span class="source-line-no">133</span><span id="line-133"> .addColumn(FAMILY1, COLUMN1).addColumn(FAMILY1, COLUMN2).setReadType(Scan.ReadType.STREAM));</span>
-<span class="source-line-no">134</span><span id="line-134"></span>
-<span class="source-line-no">135</span><span id="line-135"> ScanMetrics metrics = scanner.getScanMetrics();</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137"> scanner.next(100);</span>
+<span class="source-line-no">131</span><span id="line-131"> scanner.next(100);</span>
+<span class="source-line-no">132</span><span id="line-132"></span>
+<span class="source-line-no">133</span><span id="line-133"> // we fetch 2 columns from 1 row, so about 2 blocks</span>
+<span class="source-line-no">134</span><span id="line-134"> assertEquals(4120, metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">135</span><span id="line-135"> assertEquals(1, metrics.countOfRowsScanned.get());</span>
+<span class="source-line-no">136</span><span id="line-136"> assertEquals(1, metrics.countOfRPCcalls.get());</span>
+<span class="source-line-no">137</span><span id="line-137"> }</span>
<span class="source-line-no">138</span><span id="line-138"></span>
-<span class="source-line-no">139</span><span id="line-139"> // we fetch 2 columns from 1 row, so about 2 blocks</span>
-<span class="source-line-no">140</span><span id="line-140"> assertEquals(4120, metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">141</span><span id="line-141"> assertEquals(1, metrics.countOfRowsScanned.get());</span>
-<span class="source-line-no">142</span><span id="line-142"> assertEquals(1, metrics.countOfRPCcalls.get());</span>
-<span class="source-line-no">143</span><span id="line-143"> }</span>
-<span class="source-line-no">144</span><span id="line-144"></span>
-<span class="source-line-no">145</span><span id="line-145"> /**</span>
-<span class="source-line-no">146</span><span id="line-146"> * Tests that we check size limit after filterRowKey. When filterRowKey, we call nextRow to skip</span>
-<span class="source-line-no">147</span><span id="line-147"> * to next row. This should be efficient in this case, but we still need to check size limits</span>
-<span class="source-line-no">148</span><span id="line-148"> * after each row is processed. So in this test, we accumulate some block IO reading row 1, then</span>
-<span class="source-line-no">149</span><span id="line-149"> * skip row 2 and should return early at that point. The next rpc call starts with row3 blocks</span>
-<span class="source-line-no">150</span><span id="line-150"> * loaded, so can return the whole row in one rpc. If we were not checking size limits, we'd have</span>
-<span class="source-line-no">151</span><span id="line-151"> * been able to load an extra row 3 cell into the first rpc and thus split row 3 across multiple</span>
-<span class="source-line-no">152</span><span id="line-152"> * Results.</span>
-<span class="source-line-no">153</span><span id="line-153"> */</span>
-<span class="source-line-no">154</span><span id="line-154"> @Test</span>
-<span class="source-line-no">155</span><span id="line-155"> public void testCheckLimitAfterFilterRowKey() throws IOException {</span>
+<span class="source-line-no">139</span><span id="line-139"> /**</span>
+<span class="source-line-no">140</span><span id="line-140"> * Tests that we check size limit after filterRowKey. When filterRowKey, we call nextRow to skip</span>
+<span class="source-line-no">141</span><span id="line-141"> * to next row. This should be efficient in this case, but we still need to check size limits</span>
+<span class="source-line-no">142</span><span id="line-142"> * after each row is processed. So in this test, we accumulate some block IO reading row 1, then</span>
+<span class="source-line-no">143</span><span id="line-143"> * skip row 2 and should return early at that point. The next rpc call starts with row3 blocks</span>
+<span class="source-line-no">144</span><span id="line-144"> * loaded, so can return the whole row in one rpc. If we were not checking size limits, we'd have</span>
+<span class="source-line-no">145</span><span id="line-145"> * been able to load an extra row 3 cell into the first rpc and thus split row 3 across multiple</span>
+<span class="source-line-no">146</span><span id="line-146"> * Results.</span>
+<span class="source-line-no">147</span><span id="line-147"> */</span>
+<span class="source-line-no">148</span><span id="line-148"> @Test</span>
+<span class="source-line-no">149</span><span id="line-149"> public void testCheckLimitAfterFilterRowKey() throws IOException {</span>
+<span class="source-line-no">150</span><span id="line-150"></span>
+<span class="source-line-no">151</span><span id="line-151"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">152</span><span id="line-152"></span>
+<span class="source-line-no">153</span><span id="line-153"> ResultScanner scanner = table.getScanner(getBaseScan().addColumn(FAMILY1, COLUMN1)</span>
+<span class="source-line-no">154</span><span id="line-154"> .addColumn(FAMILY1, COLUMN2).addColumn(FAMILY1, COLUMN3).addFamily(FAMILY2)</span>
+<span class="source-line-no">155</span><span id="line-155"> .setFilter(new RowFilter(CompareOperator.NOT_EQUAL, new BinaryComparator(Bytes.toBytes(2)))));</span>
<span class="source-line-no">156</span><span id="line-156"></span>
-<span class="source-line-no">157</span><span id="line-157"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">157</span><span id="line-157"> ScanMetrics metrics = scanner.getScanMetrics();</span>
<span class="source-line-no">158</span><span id="line-158"></span>
-<span class="source-line-no">159</span><span id="line-159"> ResultScanner scanner = table.getScanner(getBaseScan().addColumn(FAMILY1, COLUMN1)</span>
-<span class="source-line-no">160</span><span id="line-160"> .addColumn(FAMILY1, COLUMN2).addColumn(FAMILY1, COLUMN3).addFamily(FAMILY2)</span>
-<span class="source-line-no">161</span><span id="line-161"> .setFilter(new RowFilter(CompareOperator.NOT_EQUAL, new BinaryComparator(Bytes.toBytes(2)))));</span>
-<span class="source-line-no">162</span><span id="line-162"></span>
-<span class="source-line-no">163</span><span id="line-163"> ScanMetrics metrics = scanner.getScanMetrics();</span>
-<span class="source-line-no">164</span><span id="line-164"></span>
-<span class="source-line-no">165</span><span id="line-165"> boolean foundRow3 = false;</span>
-<span class="source-line-no">166</span><span id="line-166"> for (Result result : scanner) {</span>
-<span class="source-line-no">167</span><span id="line-167"> Set<Integer> rows = new HashSet<>();</span>
-<span class="source-line-no">168</span><span id="line-168"> for (Cell cell : result.rawCells()) {</span>
-<span class="source-line-no">169</span><span id="line-169"> rows.add(Bytes.toInt(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength()));</span>
+<span class="source-line-no">159</span><span id="line-159"> boolean foundRow3 = false;</span>
+<span class="source-line-no">160</span><span id="line-160"> for (Result result : scanner) {</span>
+<span class="source-line-no">161</span><span id="line-161"> Set<Integer> rows = new HashSet<>();</span>
+<span class="source-line-no">162</span><span id="line-162"> for (Cell cell : result.rawCells()) {</span>
+<span class="source-line-no">163</span><span id="line-163"> rows.add(Bytes.toInt(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength()));</span>
+<span class="source-line-no">164</span><span id="line-164"> }</span>
+<span class="source-line-no">165</span><span id="line-165"> if (rows.contains(3)) {</span>
+<span class="source-line-no">166</span><span id="line-166"> assertFalse(foundRow3,</span>
+<span class="source-line-no">167</span><span id="line-167"> "expected row3 to come all in one result, but found it in two results");</span>
+<span class="source-line-no">168</span><span id="line-168"> assertEquals(1, rows.size());</span>
+<span class="source-line-no">169</span><span id="line-169"> foundRow3 = true;</span>
<span class="source-line-no">170</span><span id="line-170"> }</span>
-<span class="source-line-no">171</span><span id="line-171"> if (rows.contains(3)) {</span>
-<span class="source-line-no">172</span><span id="line-172"> assertFalse("expected row3 to come all in one result, but found it in two results",</span>
-<span class="source-line-no">173</span><span id="line-173"> foundRow3);</span>
-<span class="source-line-no">174</span><span id="line-174"> assertEquals(1, rows.size());</span>
-<span class="source-line-no">175</span><span id="line-175"> foundRow3 = true;</span>
-<span class="source-line-no">176</span><span id="line-176"> }</span>
-<span class="source-line-no">177</span><span id="line-177"> }</span>
-<span class="source-line-no">178</span><span id="line-178"></span>
-<span class="source-line-no">179</span><span id="line-179"> // 22 blocks, last one is 1030 bytes (approx 3 per row for 8 rows, but some compaction happens</span>
-<span class="source-line-no">180</span><span id="line-180"> // in family2 since each row only has 1 cell there and 2 can fit per block)</span>
-<span class="source-line-no">181</span><span id="line-181"> assertEquals(44290, metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">182</span><span id="line-182"> // We can return 22 blocks in 9 RPCs, but need an extra one to check for more rows at end</span>
-<span class="source-line-no">183</span><span id="line-183"> assertEquals(10, metrics.countOfRPCcalls.get());</span>
-<span class="source-line-no">184</span><span id="line-184"> }</span>
-<span class="source-line-no">185</span><span id="line-185"></span>
-<span class="source-line-no">186</span><span id="line-186"> /**</span>
-<span class="source-line-no">187</span><span id="line-187"> * After RegionScannerImpl.populateResults, row filters are run. If row is excluded due to</span>
-<span class="source-line-no">188</span><span id="line-188"> * filter.filterRow(), nextRow() is called which might accumulate more block IO. Validates that in</span>
-<span class="source-line-no">189</span><span id="line-189"> * this case we still honor block limits.</span>
-<span class="source-line-no">190</span><span id="line-190"> */</span>
-<span class="source-line-no">191</span><span id="line-191"> @Test</span>
-<span class="source-line-no">192</span><span id="line-192"> public void testCheckLimitAfterFilteringRowCellsDueToFilterRow() throws IOException {</span>
-<span class="source-line-no">193</span><span id="line-193"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
-<span class="source-line-no">194</span><span id="line-194"></span>
-<span class="source-line-no">195</span><span id="line-195"> ResultScanner scanner = table.getScanner(getBaseScan().withStartRow(Bytes.toBytes(1), true)</span>
-<span class="source-line-no">196</span><span id="line-196"> .addColumn(FAMILY1, COLUMN1).addColumn(FAMILY1, COLUMN2).setReadType(Scan.ReadType.STREAM)</span>
-<span class="source-line-no">197</span><span id="line-197"> .setFilter(new SkipFilter(new QualifierFilter(CompareOperator.EQUAL,</span>
-<span class="source-line-no">198</span><span id="line-198"> new BinaryComparator(Bytes.toBytes("dasfasf"))))));</span>
-<span class="source-line-no">199</span><span id="line-199"></span>
-<span class="source-line-no">200</span><span id="line-200"> // Our filter doesn't end up matching any real columns, so expect only cursors</span>
-<span class="source-line-no">201</span><span id="line-201"> for (Result result : scanner) {</span>
-<span class="source-line-no">202</span><span id="line-202"> assertTrue(result.isCursor());</span>
-<span class="source-line-no">203</span><span id="line-203"> }</span>
-<span class="source-line-no">204</span><span id="line-204"></span>
-<span class="source-line-no">205</span><span id="line-205"> ScanMetrics metrics = scanner.getScanMetrics();</span>
-<span class="source-line-no">206</span><span id="line-206"></span>
-<span class="source-line-no">207</span><span id="line-207"> // scanning over 9 rows, filtering on 2 contiguous columns each, so 9 blocks total</span>
-<span class="source-line-no">208</span><span id="line-208"> assertEquals(18540, metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">209</span><span id="line-209"> // limited to 4200 bytes per which is enough for 3 blocks (exceed limit after loading 3rd)</span>
-<span class="source-line-no">210</span><span id="line-210"> // so that's 3 RPC and the last RPC pulls the cells loaded by the last block</span>
-<span class="source-line-no">211</span><span id="line-211"> assertEquals(4, metrics.countOfRPCcalls.get());</span>
-<span class="source-line-no">212</span><span id="line-212"> }</span>
-<span class="source-line-no">213</span><span id="line-213"></span>
-<span class="source-line-no">214</span><span id="line-214"> /**</span>
-<span class="source-line-no">215</span><span id="line-215"> * At the end of the loop in StoreScanner, we do one more check of size limits. This is to catch</span>
-<span class="source-line-no">216</span><span id="line-216"> * block size being exceeded while filtering cells within a store. Test to ensure that we do that,</span>
-<span class="source-line-no">217</span><span id="line-217"> * otherwise we'd see no cursors below.</span>
-<span class="source-line-no">218</span><span id="line-218"> */</span>
-<span class="source-line-no">219</span><span id="line-219"> @Test</span>
-<span class="source-line-no">220</span><span id="line-220"> public void testCheckLimitAfterFilteringCell() throws IOException {</span>
-<span class="source-line-no">221</span><span id="line-221"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
-<span class="source-line-no">222</span><span id="line-222"></span>
-<span class="source-line-no">223</span><span id="line-223"> ResultScanner scanner = table.getScanner(getBaseScan()</span>
-<span class="source-line-no">224</span><span id="line-224"> .setFilter(new QualifierFilter(CompareOperator.EQUAL, new BinaryComparator(COLUMN2))));</span>
-<span class="source-line-no">225</span><span id="line-225"></span>
-<span class="source-line-no">226</span><span id="line-226"> int cursors = 0;</span>
-<span class="source-line-no">227</span><span id="line-227"> for (Result result : scanner) {</span>
-<span class="source-line-no">228</span><span id="line-228"> if (result.isCursor()) {</span>
-<span class="source-line-no">229</span><span id="line-229"> cursors++;</span>
-<span class="source-line-no">230</span><span id="line-230"> }</span>
-<span class="source-line-no">231</span><span id="line-231"> }</span>
-<span class="source-line-no">232</span><span id="line-232"> ScanMetrics metrics = scanner.getScanMetrics();</span>
-<span class="source-line-no">233</span><span id="line-233"> System.out.println(metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">234</span><span id="line-234"></span>
-<span class="source-line-no">235</span><span id="line-235"> // 9 rows, total of 32 blocks (last one is 1030)</span>
-<span class="source-line-no">236</span><span id="line-236"> assertEquals(64890, metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">237</span><span id="line-237"> // We can return 32 blocks in approx 11 RPCs but we need 2 cursors due to the narrow filter</span>
-<span class="source-line-no">238</span><span id="line-238"> assertEquals(2, cursors);</span>
-<span class="source-line-no">239</span><span id="line-239"> assertEquals(11, metrics.countOfRPCcalls.get());</span>
-<span class="source-line-no">240</span><span id="line-240"> }</span>
-<span class="source-line-no">241</span><span id="line-241"></span>
-<span class="source-line-no">242</span><span id="line-242"> /**</span>
-<span class="source-line-no">243</span><span id="line-243"> * After RegionScannerImpl.populateResults, row filters are run. If row is excluded due to</span>
-<span class="source-line-no">244</span><span id="line-244"> * filter.filterRowCells(), we fall through to a final results.isEmpty() check near the end of the</span>
-<span class="source-line-no">245</span><span id="line-245"> * method. If results are empty at this point (which they are), nextRow() is called which might</span>
-<span class="source-line-no">246</span><span id="line-246"> * accumulate more block IO. Validates that in this case we still honor block limits.</span>
-<span class="source-line-no">247</span><span id="line-247"> */</span>
-<span class="source-line-no">248</span><span id="line-248"> @Test</span>
-<span class="source-line-no">249</span><span id="line-249"> public void testCheckLimitAfterFilteringRowCells() throws IOException {</span>
-<span class="source-line-no">250</span><span id="line-250"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
-<span class="source-line-no">251</span><span id="line-251"></span>
-<span class="source-line-no">252</span><span id="line-252"> ResultScanner scanner = table</span>
-<span class="source-line-no">253</span><span id="line-253"> .getScanner(getBaseScan().withStartRow(Bytes.toBytes(1), true).addColumn(FAMILY1, COLUMN1)</span>
-<span class="source-line-no">254</span><span id="line-254"> .setReadType(Scan.ReadType.STREAM).setFilter(new SingleColumnValueExcludeFilter(FAMILY1,</span>
-<span class="source-line-no">255</span><span id="line-255"> COLUMN1, CompareOperator.EQUAL, new BinaryComparator(DATA))));</span>
+<span class="source-line-no">171</span><span id="line-171"> }</span>
+<span class="source-line-no">172</span><span id="line-172"></span>
+<span class="source-line-no">173</span><span id="line-173"> // 22 blocks, last one is 1030 bytes (approx 3 per row for 8 rows, but some compaction happens</span>
+<span class="source-line-no">174</span><span id="line-174"> // in family2 since each row only has 1 cell there and 2 can fit per block)</span>
+<span class="source-line-no">175</span><span id="line-175"> assertEquals(44290, metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">176</span><span id="line-176"> // We can return 22 blocks in 9 RPCs, but need an extra one to check for more rows at end</span>
+<span class="source-line-no">177</span><span id="line-177"> assertEquals(10, metrics.countOfRPCcalls.get());</span>
+<span class="source-line-no">178</span><span id="line-178"> }</span>
+<span class="source-line-no">179</span><span id="line-179"></span>
+<span class="source-line-no">180</span><span id="line-180"> /**</span>
+<span class="source-line-no">181</span><span id="line-181"> * After RegionScannerImpl.populateResults, row filters are run. If row is excluded due to</span>
+<span class="source-line-no">182</span><span id="line-182"> * filter.filterRow(), nextRow() is called which might accumulate more block IO. Validates that in</span>
+<span class="source-line-no">183</span><span id="line-183"> * this case we still honor block limits.</span>
+<span class="source-line-no">184</span><span id="line-184"> */</span>
+<span class="source-line-no">185</span><span id="line-185"> @Test</span>
+<span class="source-line-no">186</span><span id="line-186"> public void testCheckLimitAfterFilteringRowCellsDueToFilterRow() throws IOException {</span>
+<span class="source-line-no">187</span><span id="line-187"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">188</span><span id="line-188"></span>
+<span class="source-line-no">189</span><span id="line-189"> ResultScanner scanner = table.getScanner(getBaseScan().withStartRow(Bytes.toBytes(1), true)</span>
+<span class="source-line-no">190</span><span id="line-190"> .addColumn(FAMILY1, COLUMN1).addColumn(FAMILY1, COLUMN2).setReadType(Scan.ReadType.STREAM)</span>
+<span class="source-line-no">191</span><span id="line-191"> .setFilter(new SkipFilter(new QualifierFilter(CompareOperator.EQUAL,</span>
+<span class="source-line-no">192</span><span id="line-192"> new BinaryComparator(Bytes.toBytes("dasfasf"))))));</span>
+<span class="source-line-no">193</span><span id="line-193"></span>
+<span class="source-line-no">194</span><span id="line-194"> // Our filter doesn't end up matching any real columns, so expect only cursors</span>
+<span class="source-line-no">195</span><span id="line-195"> for (Result result : scanner) {</span>
+<span class="source-line-no">196</span><span id="line-196"> assertTrue(result.isCursor());</span>
+<span class="source-line-no">197</span><span id="line-197"> }</span>
+<span class="source-line-no">198</span><span id="line-198"></span>
+<span class="source-line-no">199</span><span id="line-199"> ScanMetrics metrics = scanner.getScanMetrics();</span>
+<span class="source-line-no">200</span><span id="line-200"></span>
+<span class="source-line-no">201</span><span id="line-201"> // scanning over 9 rows, filtering on 2 contiguous columns each, so 9 blocks total</span>
+<span class="source-line-no">202</span><span id="line-202"> assertEquals(18540, metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">203</span><span id="line-203"> // limited to 4200 bytes per which is enough for 3 blocks (exceed limit after loading 3rd)</span>
+<span class="source-line-no">204</span><span id="line-204"> // so that's 3 RPC and the last RPC pulls the cells loaded by the last block</span>
+<span class="source-line-no">205</span><span id="line-205"> assertEquals(4, metrics.countOfRPCcalls.get());</span>
+<span class="source-line-no">206</span><span id="line-206"> }</span>
+<span class="source-line-no">207</span><span id="line-207"></span>
+<span class="source-line-no">208</span><span id="line-208"> /**</span>
+<span class="source-line-no">209</span><span id="line-209"> * At the end of the loop in StoreScanner, we do one more check of size limits. This is to catch</span>
+<span class="source-line-no">210</span><span id="line-210"> * block size being exceeded while filtering cells within a store. Test to ensure that we do that,</span>
+<span class="source-line-no">211</span><span id="line-211"> * otherwise we'd see no cursors below.</span>
+<span class="source-line-no">212</span><span id="line-212"> */</span>
+<span class="source-line-no">213</span><span id="line-213"> @Test</span>
+<span class="source-line-no">214</span><span id="line-214"> public void testCheckLimitAfterFilteringCell() throws IOException {</span>
+<span class="source-line-no">215</span><span id="line-215"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">216</span><span id="line-216"></span>
+<span class="source-line-no">217</span><span id="line-217"> ResultScanner scanner = table.getScanner(getBaseScan()</span>
+<span class="source-line-no">218</span><span id="line-218"> .setFilter(new QualifierFilter(CompareOperator.EQUAL, new BinaryComparator(COLUMN2))));</span>
+<span class="source-line-no">219</span><span id="line-219"></span>
+<span class="source-line-no">220</span><span id="line-220"> int cursors = 0;</span>
+<span class="source-line-no">221</span><span id="line-221"> for (Result result : scanner) {</span>
+<span class="source-line-no">222</span><span id="line-222"> if (result.isCursor()) {</span>
+<span class="source-line-no">223</span><span id="line-223"> cursors++;</span>
+<span class="source-line-no">224</span><span id="line-224"> }</span>
+<span class="source-line-no">225</span><span id="line-225"> }</span>
+<span class="source-line-no">226</span><span id="line-226"> ScanMetrics metrics = scanner.getScanMetrics();</span>
+<span class="source-line-no">227</span><span id="line-227"> System.out.println(metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">228</span><span id="line-228"></span>
+<span class="source-line-no">229</span><span id="line-229"> // 9 rows, total of 32 blocks (last one is 1030)</span>
+<span class="source-line-no">230</span><span id="line-230"> assertEquals(64890, metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">231</span><span id="line-231"> // We can return 32 blocks in approx 11 RPCs but we need 2 cursors due to the narrow filter</span>
+<span class="source-line-no">232</span><span id="line-232"> assertEquals(2, cursors);</span>
+<span class="source-line-no">233</span><span id="line-233"> assertEquals(11, metrics.countOfRPCcalls.get());</span>
+<span class="source-line-no">234</span><span id="line-234"> }</span>
+<span class="source-line-no">235</span><span id="line-235"></span>
+<span class="source-line-no">236</span><span id="line-236"> /**</span>
+<span class="source-line-no">237</span><span id="line-237"> * After RegionScannerImpl.populateResults, row filters are run. If row is excluded due to</span>
+<span class="source-line-no">238</span><span id="line-238"> * filter.filterRowCells(), we fall through to a final results.isEmpty() check near the end of the</span>
+<span class="source-line-no">239</span><span id="line-239"> * method. If results are empty at this point (which they are), nextRow() is called which might</span>
+<span class="source-line-no">240</span><span id="line-240"> * accumulate more block IO. Validates that in this case we still honor block limits.</span>
+<span class="source-line-no">241</span><span id="line-241"> */</span>
+<span class="source-line-no">242</span><span id="line-242"> @Test</span>
+<span class="source-line-no">243</span><span id="line-243"> public void testCheckLimitAfterFilteringRowCells() throws IOException {</span>
+<span class="source-line-no">244</span><span id="line-244"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">245</span><span id="line-245"></span>
+<span class="source-line-no">246</span><span id="line-246"> ResultScanner scanner = table</span>
+<span class="source-line-no">247</span><span id="line-247"> .getScanner(getBaseScan().withStartRow(Bytes.toBytes(1), true).addColumn(FAMILY1, COLUMN1)</span>
+<span class="source-line-no">248</span><span id="line-248"> .setReadType(Scan.ReadType.STREAM).setFilter(new SingleColumnValueExcludeFilter(FAMILY1,</span>
+<span class="source-line-no">249</span><span id="line-249"> COLUMN1, CompareOperator.EQUAL, new BinaryComparator(DATA))));</span>
+<span class="source-line-no">250</span><span id="line-250"></span>
+<span class="source-line-no">251</span><span id="line-251"> // Since we use SingleColumnValueExcludeFilter and dont include any other columns, the column</span>
+<span class="source-line-no">252</span><span id="line-252"> // we load to test ends up being excluded from the result. So we only expect cursors here.</span>
+<span class="source-line-no">253</span><span id="line-253"> for (Result result : scanner) {</span>
+<span class="source-line-no">254</span><span id="line-254"> assertTrue(result.isCursor());</span>
+<span class="source-line-no">255</span><span id="line-255"> }</span>
<span class="source-line-no">256</span><span id="line-256"></span>
-<span class="source-line-no">257</span><span id="line-257"> // Since we use SingleColumnValueExcludeFilter and dont include any other columns, the column</span>
-<span class="source-line-no">258</span><span id="line-258"> // we load to test ends up being excluded from the result. So we only expect cursors here.</span>
-<span class="source-line-no">259</span><span id="line-259"> for (Result result : scanner) {</span>
-<span class="source-line-no">260</span><span id="line-260"> assertTrue(result.isCursor());</span>
-<span class="source-line-no">261</span><span id="line-261"> }</span>
-<span class="source-line-no">262</span><span id="line-262"></span>
-<span class="source-line-no">263</span><span id="line-263"> ScanMetrics metrics = scanner.getScanMetrics();</span>
-<span class="source-line-no">264</span><span id="line-264"></span>
-<span class="source-line-no">265</span><span id="line-265"> // Our filter causes us to read the first column of each row, then INCLUDE_AND_SEEK_NEXT_ROW.</span>
-<span class="source-line-no">266</span><span id="line-266"> // So we load 1 block per row, and there are 9 rows. So 9 blocks</span>
-<span class="source-line-no">267</span><span id="line-267"> assertEquals(18540, metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">268</span><span id="line-268"> // We can return 9 blocks in 3 RPCs, but need 1 more to check for more results (returns 0)</span>
-<span class="source-line-no">269</span><span id="line-269"> assertEquals(4, metrics.countOfRPCcalls.get());</span>
-<span class="source-line-no">270</span><span id="line-270"> }</span>
-<span class="source-line-no">271</span><span id="line-271"></span>
-<span class="source-line-no">272</span><span id="line-272"> /**</span>
-<span class="source-line-no">273</span><span id="line-273"> * Tests that when we seek over blocks we dont include them in the block size of the request</span>
-<span class="source-line-no">274</span><span id="line-274"> */</span>
-<span class="source-line-no">275</span><span id="line-275"> @Test</span>
-<span class="source-line-no">276</span><span id="line-276"> public void testSeekNextUsingHint() throws IOException {</span>
-<span class="source-line-no">277</span><span id="line-277"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">257</span><span id="line-257"> ScanMetrics metrics = scanner.getScanMetrics();</span>
+<span class="source-line-no">258</span><span id="line-258"></span>
+<span class="source-line-no">259</span><span id="line-259"> // Our filter causes us to read the first column of each row, then INCLUDE_AND_SEEK_NEXT_ROW.</span>
+<span class="source-line-no">260</span><span id="line-260"> // So we load 1 block per row, and there are 9 rows. So 9 blocks</span>
+<span class="source-line-no">261</span><span id="line-261"> assertEquals(18540, metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">262</span><span id="line-262"> // We can return 9 blocks in 3 RPCs, but need 1 more to check for more results (returns 0)</span>
+<span class="source-line-no">263</span><span id="line-263"> assertEquals(4, metrics.countOfRPCcalls.get());</span>
+<span class="source-line-no">264</span><span id="line-264"> }</span>
+<span class="source-line-no">265</span><span id="line-265"></span>
+<span class="source-line-no">266</span><span id="line-266"> /**</span>
+<span class="source-line-no">267</span><span id="line-267"> * Tests that when we seek over blocks we dont include them in the block size of the request</span>
+<span class="source-line-no">268</span><span id="line-268"> */</span>
+<span class="source-line-no">269</span><span id="line-269"> @Test</span>
+<span class="source-line-no">270</span><span id="line-270"> public void testSeekNextUsingHint() throws IOException {</span>
+<span class="source-line-no">271</span><span id="line-271"> Table table = TEST_UTIL.getConnection().getTable(TABLE);</span>
+<span class="source-line-no">272</span><span id="line-272"></span>
+<span class="source-line-no">273</span><span id="line-273"> ResultScanner scanner = table.getScanner(</span>
+<span class="source-line-no">274</span><span id="line-274"> getBaseScan().addFamily(FAMILY1).setFilter(new ColumnPaginationFilter(1, COLUMN5)));</span>
+<span class="source-line-no">275</span><span id="line-275"></span>
+<span class="source-line-no">276</span><span id="line-276"> scanner.next(100);</span>
+<span class="source-line-no">277</span><span id="line-277"> ScanMetrics metrics = scanner.getScanMetrics();</span>
<span class="source-line-no">278</span><span id="line-278"></span>
-<span class="source-line-no">279</span><span id="line-279"> ResultScanner scanner = table.getScanner(</span>
-<span class="source-line-no">280</span><span id="line-280"> getBaseScan().addFamily(FAMILY1).setFilter(new ColumnPaginationFilter(1, COLUMN5)));</span>
-<span class="source-line-no">281</span><span id="line-281"></span>
-<span class="source-line-no">282</span><span id="line-282"> scanner.next(100);</span>
-<span class="source-line-no">283</span><span id="line-283"> ScanMetrics metrics = scanner.getScanMetrics();</span>
-<span class="source-line-no">284</span><span id="line-284"></span>
-<span class="source-line-no">285</span><span id="line-285"> // We have to read the first cell/block of each row, then can skip to the last block. So that's</span>
-<span class="source-line-no">286</span><span id="line-286"> // 2 blocks per row to read (18 blocks total)</span>
-<span class="source-line-no">287</span><span id="line-287"> assertEquals(37080, metrics.countOfBlockBytesScanned.get());</span>
-<span class="source-line-no">288</span><span id="line-288"> // Our max scan size is enough to read 3 blocks per RPC, plus one final RPC to finish region.</span>
-<span class="source-line-no">289</span><span id="line-289"> assertEquals(7, metrics.countOfRPCcalls.get());</span>
-<span class="source-line-no">290</span><span id="line-290"> }</span>
-<span class="source-line-no">291</span><span id="line-291"></span>
-<span class="source-line-no">292</span><span id="line-292"> /**</span>
-<span class="source-line-no">293</span><span id="line-293"> * We enable cursors and partial results to give us more granularity over counting of results, and</span>
-<span class="source-line-no">294</span><span id="line-294"> * we enable STREAM so that no auto switching from pread to stream occurs -- this throws off the</span>
-<span class="source-line-no">295</span><span id="line-295"> * rpc counts.</span>
-<span class="source-line-no">296</span><span id="line-296"> */</span>
-<span class="source-line-no">297</span><span id="line-297"> private Scan getBaseScan() {</span>
-<span class="source-line-no">298</span><span id="line-298"> return new Scan().setScanMetricsEnabled(true).setNeedCursorResult(true)</span>
-<span class="source-line-no">299</span><span id="line-299"> .setAllowPartialResults(true).setReadType(Scan.ReadType.STREAM);</span>
-<span class="source-line-no">300</span><span id="line-300"> }</span>
-<span class="source-line-no">301</span><span id="line-301">}</span>
+<span class="source-line-no">279</span><span id="line-279"> // We have to read the first cell/block of each row, then can skip to the last block. So that's</span>
+<span class="source-line-no">280</span><span id="line-280"> // 2 blocks per row to read (18 blocks total)</span>
+<span class="source-line-no">281</span><span id="line-281"> assertEquals(37080, metrics.countOfBlockBytesScanned.get());</span>
+<span class="source-line-no">282</span><span id="line-282"> // Our max scan size is enough to read 3 blocks per RPC, plus one final RPC to finish region.</span>
+<span class="source-line-no">283</span><span id="line-283"> assertEquals(7, metrics.countOfRPCcalls.get());</span>
+<span class="source-line-no">284</span><span id="line-284"> }</span>
+<span class="source-line-no">285</span><span id="line-285"></span>
+<span class="source-line-no">286</span><span id="line-286"> /**</span>
+<span class="source-line-no">287</span><span id="line-287"> * We enable cursors and partial results to give us more granularity over counting of results, and</span>
+<span class="source-line-no">288</span><span id="line-288"> * we enable STREAM so that no auto switching from pread to stream occurs -- this throws off the</span>
+<span class="source-line-no">289</span><span id="line-289"> * rpc counts.</span>
+<span class="source-line-no">290</span><span id="line-290"> */</span>
+<span class="source-line-no">291</span><span id="line-291"> private Scan getBaseScan() {</span>
+<span class="source-line-no">292</span><span id="line-292"> return new Scan().setScanMetricsEnabled(true).setNeedCursorResult(true)</span>
+<span class="source-line-no">293</span><span id="line-293"> .setAllowPartialResults(true).setReadType(Scan.ReadType.STREAM);</span>
+<span class="source-line-no">294</span><span id="line-294"> }</span>
+<span class="source-line-no">295</span><span id="line-295">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseCellFilter.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseCellFilter.html
index d189d635510..d74c7abb1d6 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseCellFilter.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseCellFilter.html
@@ -31,9 +31,9 @@
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
<span class="source-line-no">020</span><span id="line-20">import static org.apache.hadoop.hbase.regionserver.RSRpcServices.DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">022</span><span id="line-22">import static org.junit.Assert.assertTrue;</span>
-<span class="source-line-no">023</span><span id="line-23">import static org.junit.Assert.fail;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">022</span><span id="line-22">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
+<span class="source-line-no">023</span><span id="line-23">import static org.junit.jupiter.api.Assertions.fail;</span>
<span class="source-line-no">024</span><span id="line-24">import static org.mockito.Mockito.when;</span>
<span class="source-line-no">025</span><span id="line-25"></span>
<span class="source-line-no">026</span><span id="line-26">import java.io.IOException;</span>
@@ -49,632 +49,626 @@
<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.CellComparatorImpl;</span>
<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.CellUtil;</span>
<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.ExtendedCell;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.HTestConst;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.KeyValue;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.AsyncConnection;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.AsyncTable;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.RegionInfo;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.client.ScanPerNextResultScanner;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
-<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.filter.Filter;</span>
-<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.filter.FilterBase;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.ipc.HBaseRpcController;</span>
-<span class="source-line-no">060</span><span id="line-60">import org.apache.hadoop.hbase.ipc.RpcCall;</span>
-<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
-<span class="source-line-no">062</span><span id="line-62">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">063</span><span id="line-63">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
-<span class="source-line-no">064</span><span id="line-64">import org.apache.hadoop.hbase.util.Threads;</span>
-<span class="source-line-no">065</span><span id="line-65">import org.apache.hadoop.hbase.wal.WAL;</span>
-<span class="source-line-no">066</span><span id="line-66">import org.junit.After;</span>
-<span class="source-line-no">067</span><span id="line-67">import org.junit.AfterClass;</span>
-<span class="source-line-no">068</span><span id="line-68">import org.junit.Before;</span>
-<span class="source-line-no">069</span><span id="line-69">import org.junit.BeforeClass;</span>
-<span class="source-line-no">070</span><span id="line-70">import org.junit.ClassRule;</span>
-<span class="source-line-no">071</span><span id="line-71">import org.junit.Test;</span>
-<span class="source-line-no">072</span><span id="line-72">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">073</span><span id="line-73">import org.mockito.Mockito;</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">import org.apache.hbase.thirdparty.com.google.common.io.Closeables;</span>
-<span class="source-line-no">076</span><span id="line-76">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
-<span class="source-line-no">077</span><span id="line-77">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
-<span class="source-line-no">078</span><span id="line-78"></span>
-<span class="source-line-no">079</span><span id="line-79">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;</span>
-<span class="source-line-no">080</span><span id="line-80">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82">/**</span>
-<span class="source-line-no">083</span><span id="line-83"> * Here we test to make sure that scans return the expected Results when the server is sending the</span>
-<span class="source-line-no">084</span><span id="line-84"> * Client heartbeat messages. Heartbeat messages are essentially keep-alive messages (they prevent</span>
-<span class="source-line-no">085</span><span id="line-85"> * the scanner on the client side from timing out). A heartbeat message is sent from the server to</span>
-<span class="source-line-no">086</span><span id="line-86"> * the client when the server has exceeded the time limit during the processing of the scan. When</span>
-<span class="source-line-no">087</span><span id="line-87"> * the time limit is reached, the server will return to the Client whatever Results it has</span>
-<span class="source-line-no">088</span><span id="line-88"> * accumulated (potentially empty).</span>
-<span class="source-line-no">089</span><span id="line-89"> */</span>
-<span class="source-line-no">090</span><span id="line-90">@Category(LargeTests.class)</span>
-<span class="source-line-no">091</span><span id="line-91">public class TestScannerHeartbeatMessages {</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.HTestConst;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.KeyValue;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.AsyncConnection;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.AsyncTable;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.RegionInfo;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.client.ScanPerNextResultScanner;</span>
+<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
+<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.filter.Filter;</span>
+<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.filter.FilterBase;</span>
+<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.ipc.HBaseRpcController;</span>
+<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.ipc.RpcCall;</span>
+<span class="source-line-no">060</span><span id="line-60">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
+<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">062</span><span id="line-62">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
+<span class="source-line-no">063</span><span id="line-63">import org.apache.hadoop.hbase.util.Threads;</span>
+<span class="source-line-no">064</span><span id="line-64">import org.apache.hadoop.hbase.wal.WAL;</span>
+<span class="source-line-no">065</span><span id="line-65">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">066</span><span id="line-66">import org.junit.jupiter.api.AfterEach;</span>
+<span class="source-line-no">067</span><span id="line-67">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">068</span><span id="line-68">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">069</span><span id="line-69">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">070</span><span id="line-70">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">071</span><span id="line-71">import org.mockito.Mockito;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">import org.apache.hbase.thirdparty.com.google.common.io.Closeables;</span>
+<span class="source-line-no">074</span><span id="line-74">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
+<span class="source-line-no">075</span><span id="line-75">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;</span>
+<span class="source-line-no">078</span><span id="line-78">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;</span>
+<span class="source-line-no">079</span><span id="line-79"></span>
+<span class="source-line-no">080</span><span id="line-80">/**</span>
+<span class="source-line-no">081</span><span id="line-81"> * Here we test to make sure that scans return the expected Results when the server is sending the</span>
+<span class="source-line-no">082</span><span id="line-82"> * Client heartbeat messages. Heartbeat messages are essentially keep-alive messages (they prevent</span>
+<span class="source-line-no">083</span><span id="line-83"> * the scanner on the client side from timing out). A heartbeat message is sent from the server to</span>
+<span class="source-line-no">084</span><span id="line-84"> * the client when the server has exceeded the time limit during the processing of the scan. When</span>
+<span class="source-line-no">085</span><span id="line-85"> * the time limit is reached, the server will return to the Client whatever Results it has</span>
+<span class="source-line-no">086</span><span id="line-86"> * accumulated (potentially empty).</span>
+<span class="source-line-no">087</span><span id="line-87"> */</span>
+<span class="source-line-no">088</span><span id="line-88">@Tag(LargeTests.TAG)</span>
+<span class="source-line-no">089</span><span id="line-89">public class TestScannerHeartbeatMessages {</span>
+<span class="source-line-no">090</span><span id="line-90"></span>
+<span class="source-line-no">091</span><span id="line-91"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93"> @ClassRule</span>
-<span class="source-line-no">094</span><span id="line-94"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">095</span><span id="line-95"> HBaseClassTestRule.forClass(TestScannerHeartbeatMessages.class);</span>
-<span class="source-line-no">096</span><span id="line-96"></span>
-<span class="source-line-no">097</span><span id="line-97"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99"> private static AsyncConnection CONN;</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101"> /**</span>
-<span class="source-line-no">102</span><span id="line-102"> * Table configuration</span>
-<span class="source-line-no">103</span><span id="line-103"> */</span>
-<span class="source-line-no">104</span><span id="line-104"> private static TableName TABLE_NAME = TableName.valueOf("testScannerHeartbeatMessagesTable");</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106"> private static int NUM_ROWS = 5;</span>
-<span class="source-line-no">107</span><span id="line-107"> private static byte[] ROW = Bytes.toBytes("testRow");</span>
-<span class="source-line-no">108</span><span id="line-108"> private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);</span>
-<span class="source-line-no">109</span><span id="line-109"></span>
-<span class="source-line-no">110</span><span id="line-110"> private static int NUM_FAMILIES = 4;</span>
-<span class="source-line-no">111</span><span id="line-111"> private static byte[] FAMILY = Bytes.toBytes("testFamily");</span>
-<span class="source-line-no">112</span><span id="line-112"> private static byte[][] FAMILIES = HTestConst.makeNAscii(FAMILY, NUM_FAMILIES);</span>
-<span class="source-line-no">113</span><span id="line-113"></span>
-<span class="source-line-no">114</span><span id="line-114"> private static int NUM_QUALIFIERS = 3;</span>
-<span class="source-line-no">115</span><span id="line-115"> private static byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
-<span class="source-line-no">116</span><span id="line-116"> private static byte[][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, NUM_QUALIFIERS);</span>
-<span class="source-line-no">117</span><span id="line-117"></span>
-<span class="source-line-no">118</span><span id="line-118"> private static int VALUE_SIZE = 128;</span>
-<span class="source-line-no">119</span><span id="line-119"> private static byte[] VALUE = Bytes.createMaxByteArray(VALUE_SIZE);</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121"> // The time limit should be based on the rpc timeout at client, or the client will regards</span>
-<span class="source-line-no">122</span><span id="line-122"> // the request as timeout before server return a heartbeat.</span>
-<span class="source-line-no">123</span><span id="line-123"> private static int SERVER_TIMEOUT = 60000;</span>
-<span class="source-line-no">124</span><span id="line-124"></span>
-<span class="source-line-no">125</span><span id="line-125"> // Time, in milliseconds, that the client will wait for a response from the server before timing</span>
-<span class="source-line-no">126</span><span id="line-126"> // out. This value is used server side to determine when it is necessary to send a heartbeat</span>
-<span class="source-line-no">127</span><span id="line-127"> // message to the client. Time limit will be 500 ms.</span>
-<span class="source-line-no">128</span><span id="line-128"> private static int CLIENT_TIMEOUT = 1000;</span>
-<span class="source-line-no">129</span><span id="line-129"></span>
-<span class="source-line-no">130</span><span id="line-130"> // In this test, we sleep after reading each row. So we should make sure after we get some number</span>
-<span class="source-line-no">131</span><span id="line-131"> // of rows and sleep same times we must reach time limit, and do not timeout after next sleeping.</span>
-<span class="source-line-no">132</span><span id="line-132"> private static int DEFAULT_ROW_SLEEP_TIME = 300;</span>
-<span class="source-line-no">133</span><span id="line-133"></span>
-<span class="source-line-no">134</span><span id="line-134"> // Similar with row sleep time.</span>
-<span class="source-line-no">135</span><span id="line-135"> private static int DEFAULT_CF_SLEEP_TIME = 300;</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137"> @BeforeClass</span>
-<span class="source-line-no">138</span><span id="line-138"> public static void setUpBeforeClass() throws Exception {</span>
-<span class="source-line-no">139</span><span id="line-139"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">093</span><span id="line-93"> private static AsyncConnection CONN;</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95"> /**</span>
+<span class="source-line-no">096</span><span id="line-96"> * Table configuration</span>
+<span class="source-line-no">097</span><span id="line-97"> */</span>
+<span class="source-line-no">098</span><span id="line-98"> private static TableName TABLE_NAME = TableName.valueOf("testScannerHeartbeatMessagesTable");</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100"> private static int NUM_ROWS = 5;</span>
+<span class="source-line-no">101</span><span id="line-101"> private static byte[] ROW = Bytes.toBytes("testRow");</span>
+<span class="source-line-no">102</span><span id="line-102"> private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104"> private static int NUM_FAMILIES = 4;</span>
+<span class="source-line-no">105</span><span id="line-105"> private static byte[] FAMILY = Bytes.toBytes("testFamily");</span>
+<span class="source-line-no">106</span><span id="line-106"> private static byte[][] FAMILIES = HTestConst.makeNAscii(FAMILY, NUM_FAMILIES);</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108"> private static int NUM_QUALIFIERS = 3;</span>
+<span class="source-line-no">109</span><span id="line-109"> private static byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
+<span class="source-line-no">110</span><span id="line-110"> private static byte[][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, NUM_QUALIFIERS);</span>
+<span class="source-line-no">111</span><span id="line-111"></span>
+<span class="source-line-no">112</span><span id="line-112"> private static int VALUE_SIZE = 128;</span>
+<span class="source-line-no">113</span><span id="line-113"> private static byte[] VALUE = Bytes.createMaxByteArray(VALUE_SIZE);</span>
+<span class="source-line-no">114</span><span id="line-114"></span>
+<span class="source-line-no">115</span><span id="line-115"> // The time limit should be based on the rpc timeout at client, or the client will regards</span>
+<span class="source-line-no">116</span><span id="line-116"> // the request as timeout before server return a heartbeat.</span>
+<span class="source-line-no">117</span><span id="line-117"> private static int SERVER_TIMEOUT = 60000;</span>
+<span class="source-line-no">118</span><span id="line-118"></span>
+<span class="source-line-no">119</span><span id="line-119"> // Time, in milliseconds, that the client will wait for a response from the server before timing</span>
+<span class="source-line-no">120</span><span id="line-120"> // out. This value is used server side to determine when it is necessary to send a heartbeat</span>
+<span class="source-line-no">121</span><span id="line-121"> // message to the client. Time limit will be 500 ms.</span>
+<span class="source-line-no">122</span><span id="line-122"> private static int CLIENT_TIMEOUT = 1000;</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124"> // In this test, we sleep after reading each row. So we should make sure after we get some number</span>
+<span class="source-line-no">125</span><span id="line-125"> // of rows and sleep same times we must reach time limit, and do not timeout after next sleeping.</span>
+<span class="source-line-no">126</span><span id="line-126"> private static int DEFAULT_ROW_SLEEP_TIME = 300;</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128"> // Similar with row sleep time.</span>
+<span class="source-line-no">129</span><span id="line-129"> private static int DEFAULT_CF_SLEEP_TIME = 300;</span>
+<span class="source-line-no">130</span><span id="line-130"></span>
+<span class="source-line-no">131</span><span id="line-131"> @BeforeAll</span>
+<span class="source-line-no">132</span><span id="line-132"> public static void setUpBeforeClass() throws Exception {</span>
+<span class="source-line-no">133</span><span id="line-133"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">134</span><span id="line-134"></span>
+<span class="source-line-no">135</span><span id="line-135"> conf.setStrings(HConstants.REGION_IMPL, HeartbeatHRegion.class.getName());</span>
+<span class="source-line-no">136</span><span id="line-136"> conf.setStrings(HConstants.REGION_SERVER_IMPL, HeartbeatHRegionServer.class.getName());</span>
+<span class="source-line-no">137</span><span id="line-137"> conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SERVER_TIMEOUT);</span>
+<span class="source-line-no">138</span><span id="line-138"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, SERVER_TIMEOUT);</span>
+<span class="source-line-no">139</span><span id="line-139"> conf.setInt(HConstants.HBASE_CLIENT_PAUSE, 1);</span>
<span class="source-line-no">140</span><span id="line-140"></span>
-<span class="source-line-no">141</span><span id="line-141"> conf.setStrings(HConstants.REGION_IMPL, HeartbeatHRegion.class.getName());</span>
-<span class="source-line-no">142</span><span id="line-142"> conf.setStrings(HConstants.REGION_SERVER_IMPL, HeartbeatHRegionServer.class.getName());</span>
-<span class="source-line-no">143</span><span id="line-143"> conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SERVER_TIMEOUT);</span>
-<span class="source-line-no">144</span><span id="line-144"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, SERVER_TIMEOUT);</span>
-<span class="source-line-no">145</span><span id="line-145"> conf.setInt(HConstants.HBASE_CLIENT_PAUSE, 1);</span>
+<span class="source-line-no">141</span><span id="line-141"> // Check the timeout condition after every cell</span>
+<span class="source-line-no">142</span><span id="line-142"> conf.setLong(StoreScanner.HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK, 1);</span>
+<span class="source-line-no">143</span><span id="line-143"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145"> createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);</span>
<span class="source-line-no">146</span><span id="line-146"></span>
-<span class="source-line-no">147</span><span id="line-147"> // Check the timeout condition after every cell</span>
-<span class="source-line-no">148</span><span id="line-148"> conf.setLong(StoreScanner.HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK, 1);</span>
-<span class="source-line-no">149</span><span id="line-149"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">150</span><span id="line-150"></span>
-<span class="source-line-no">151</span><span id="line-151"> createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);</span>
+<span class="source-line-no">147</span><span id="line-147"> Configuration newConf = new Configuration(conf);</span>
+<span class="source-line-no">148</span><span id="line-148"> newConf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, CLIENT_TIMEOUT);</span>
+<span class="source-line-no">149</span><span id="line-149"> newConf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, CLIENT_TIMEOUT);</span>
+<span class="source-line-no">150</span><span id="line-150"> CONN = ConnectionFactory.createAsyncConnection(newConf).get();</span>
+<span class="source-line-no">151</span><span id="line-151"> }</span>
<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> Configuration newConf = new Configuration(conf);</span>
-<span class="source-line-no">154</span><span id="line-154"> newConf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, CLIENT_TIMEOUT);</span>
-<span class="source-line-no">155</span><span id="line-155"> newConf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, CLIENT_TIMEOUT);</span>
-<span class="source-line-no">156</span><span id="line-156"> CONN = ConnectionFactory.createAsyncConnection(newConf).get();</span>
-<span class="source-line-no">157</span><span id="line-157"> }</span>
-<span class="source-line-no">158</span><span id="line-158"></span>
-<span class="source-line-no">159</span><span id="line-159"> @Test</span>
-<span class="source-line-no">160</span><span id="line-160"> public void testTimeLimitAccountsForQueueTime() throws IOException, InterruptedException {</span>
-<span class="source-line-no">161</span><span id="line-161"> HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
-<span class="source-line-no">162</span><span id="line-162"> RSRpcServices services = new RSRpcServices(rs);</span>
-<span class="source-line-no">163</span><span id="line-163"> RpcCall mockRpcCall = Mockito.mock(RpcCall.class);</span>
-<span class="source-line-no">164</span><span id="line-164"> // first return 180 (minimal queuing), then 120 (more queueing), then 101 (heavy queueing)</span>
-<span class="source-line-no">165</span><span id="line-165"> // finally, 25 is fatal levels of queueing -- exceeding timeout</span>
-<span class="source-line-no">166</span><span id="line-166"> when(mockRpcCall.getReceiveTime()).thenReturn(180L, 120L, 101L, 25L);</span>
-<span class="source-line-no">167</span><span id="line-167"></span>
-<span class="source-line-no">168</span><span id="line-168"> // assume timeout of 100ms</span>
-<span class="source-line-no">169</span><span id="line-169"> HBaseRpcController mockController = Mockito.mock(HBaseRpcController.class);</span>
-<span class="source-line-no">170</span><span id="line-170"> when(mockController.getCallTimeout()).thenReturn(100);</span>
-<span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172"> // current time is 100, which we'll subtract from 90 and 50 to generate some time deltas</span>
-<span class="source-line-no">173</span><span id="line-173"> EnvironmentEdgeManager.injectEdge(() -> 200L);</span>
-<span class="source-line-no">174</span><span id="line-174"></span>
-<span class="source-line-no">175</span><span id="line-175"> try {</span>
-<span class="source-line-no">176</span><span id="line-176"> // we queued for 20ms, leaving 80ms of timeout, which we divide by 2</span>
-<span class="source-line-no">177</span><span id="line-177"> assertEquals(200 + (100 - 20) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">178</span><span id="line-178"> // we queued for 80ms, leaving 20ms of timeout, which we divide by 2</span>
-<span class="source-line-no">179</span><span id="line-179"> assertEquals(200 + (100 - 80) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">180</span><span id="line-180"> // we queued for 99ms of 100ms timeout, leaving only 1ms. we fall back to default minimum</span>
-<span class="source-line-no">181</span><span id="line-181"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
-<span class="source-line-no">182</span><span id="line-182"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">183</span><span id="line-183"> // lastly, we queue for 175ms of 100ms timeout. this should be very rare since we drop</span>
-<span class="source-line-no">184</span><span id="line-184"> // timed out calls in the queue. in this case we still fallback on default minimum for now.</span>
-<span class="source-line-no">185</span><span id="line-185"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
-<span class="source-line-no">186</span><span id="line-186"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">187</span><span id="line-187"> } finally {</span>
-<span class="source-line-no">188</span><span id="line-188"> EnvironmentEdgeManager.reset();</span>
-<span class="source-line-no">189</span><span id="line-189"> }</span>
-<span class="source-line-no">190</span><span id="line-190"></span>
-<span class="source-line-no">191</span><span id="line-191"> }</span>
-<span class="source-line-no">192</span><span id="line-192"></span>
-<span class="source-line-no">193</span><span id="line-193"> static void createTestTable(TableName name, byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
-<span class="source-line-no">194</span><span id="line-194"> byte[] cellValue) throws IOException {</span>
-<span class="source-line-no">195</span><span id="line-195"> Table ht = TEST_UTIL.createTable(name, families);</span>
-<span class="source-line-no">196</span><span id="line-196"> List<Put> puts = createPuts(rows, families, qualifiers, cellValue);</span>
-<span class="source-line-no">197</span><span id="line-197"> ht.put(puts);</span>
-<span class="source-line-no">198</span><span id="line-198"> }</span>
-<span class="source-line-no">199</span><span id="line-199"></span>
-<span class="source-line-no">200</span><span id="line-200"> /**</span>
-<span class="source-line-no">201</span><span id="line-201"> * Make puts to put the input value into each combination of row, family, and qualifier</span>
-<span class="source-line-no">202</span><span id="line-202"> */</span>
-<span class="source-line-no">203</span><span id="line-203"> static ArrayList<Put> createPuts(byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
-<span class="source-line-no">204</span><span id="line-204"> byte[] value) throws IOException {</span>
-<span class="source-line-no">205</span><span id="line-205"> Put put;</span>
-<span class="source-line-no">206</span><span id="line-206"> ArrayList<Put> puts = new ArrayList<>();</span>
-<span class="source-line-no">207</span><span id="line-207"></span>
-<span class="source-line-no">208</span><span id="line-208"> for (int row = 0; row < rows.length; row++) {</span>
-<span class="source-line-no">209</span><span id="line-209"> put = new Put(rows[row]);</span>
-<span class="source-line-no">210</span><span id="line-210"> for (int fam = 0; fam < families.length; fam++) {</span>
-<span class="source-line-no">211</span><span id="line-211"> for (int qual = 0; qual < qualifiers.length; qual++) {</span>
-<span class="source-line-no">212</span><span id="line-212"> KeyValue kv = new KeyValue(rows[row], families[fam], qualifiers[qual], qual, value);</span>
-<span class="source-line-no">213</span><span id="line-213"> put.add(kv);</span>
-<span class="source-line-no">214</span><span id="line-214"> }</span>
-<span class="source-line-no">215</span><span id="line-215"> }</span>
-<span class="source-line-no">216</span><span id="line-216"> puts.add(put);</span>
-<span class="source-line-no">217</span><span id="line-217"> }</span>
-<span class="source-line-no">218</span><span id="line-218"></span>
-<span class="source-line-no">219</span><span id="line-219"> return puts;</span>
+<span class="source-line-no">153</span><span id="line-153"> @Test</span>
+<span class="source-line-no">154</span><span id="line-154"> public void testTimeLimitAccountsForQueueTime() throws IOException, InterruptedException {</span>
+<span class="source-line-no">155</span><span id="line-155"> HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
+<span class="source-line-no">156</span><span id="line-156"> RSRpcServices services = new RSRpcServices(rs);</span>
+<span class="source-line-no">157</span><span id="line-157"> RpcCall mockRpcCall = Mockito.mock(RpcCall.class);</span>
+<span class="source-line-no">158</span><span id="line-158"> // first return 180 (minimal queuing), then 120 (more queueing), then 101 (heavy queueing)</span>
+<span class="source-line-no">159</span><span id="line-159"> // finally, 25 is fatal levels of queueing -- exceeding timeout</span>
+<span class="source-line-no">160</span><span id="line-160"> when(mockRpcCall.getReceiveTime()).thenReturn(180L, 120L, 101L, 25L);</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162"> // assume timeout of 100ms</span>
+<span class="source-line-no">163</span><span id="line-163"> HBaseRpcController mockController = Mockito.mock(HBaseRpcController.class);</span>
+<span class="source-line-no">164</span><span id="line-164"> when(mockController.getCallTimeout()).thenReturn(100);</span>
+<span class="source-line-no">165</span><span id="line-165"></span>
+<span class="source-line-no">166</span><span id="line-166"> // current time is 100, which we'll subtract from 90 and 50 to generate some time deltas</span>
+<span class="source-line-no">167</span><span id="line-167"> EnvironmentEdgeManager.injectEdge(() -> 200L);</span>
+<span class="source-line-no">168</span><span id="line-168"></span>
+<span class="source-line-no">169</span><span id="line-169"> try {</span>
+<span class="source-line-no">170</span><span id="line-170"> // we queued for 20ms, leaving 80ms of timeout, which we divide by 2</span>
+<span class="source-line-no">171</span><span id="line-171"> assertEquals(200 + (100 - 20) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">172</span><span id="line-172"> // we queued for 80ms, leaving 20ms of timeout, which we divide by 2</span>
+<span class="source-line-no">173</span><span id="line-173"> assertEquals(200 + (100 - 80) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">174</span><span id="line-174"> // we queued for 99ms of 100ms timeout, leaving only 1ms. we fall back to default minimum</span>
+<span class="source-line-no">175</span><span id="line-175"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
+<span class="source-line-no">176</span><span id="line-176"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">177</span><span id="line-177"> // lastly, we queue for 175ms of 100ms timeout. this should be very rare since we drop</span>
+<span class="source-line-no">178</span><span id="line-178"> // timed out calls in the queue. in this case we still fallback on default minimum for now.</span>
+<span class="source-line-no">179</span><span id="line-179"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
+<span class="source-line-no">180</span><span id="line-180"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">181</span><span id="line-181"> } finally {</span>
+<span class="source-line-no">182</span><span id="line-182"> EnvironmentEdgeManager.reset();</span>
+<span class="source-line-no">183</span><span id="line-183"> }</span>
+<span class="source-line-no">184</span><span id="line-184"></span>
+<span class="source-line-no">185</span><span id="line-185"> }</span>
+<span class="source-line-no">186</span><span id="line-186"></span>
+<span class="source-line-no">187</span><span id="line-187"> static void createTestTable(TableName name, byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
+<span class="source-line-no">188</span><span id="line-188"> byte[] cellValue) throws IOException {</span>
+<span class="source-line-no">189</span><span id="line-189"> Table ht = TEST_UTIL.createTable(name, families);</span>
+<span class="source-line-no">190</span><span id="line-190"> List<Put> puts = createPuts(rows, families, qualifiers, cellValue);</span>
+<span class="source-line-no">191</span><span id="line-191"> ht.put(puts);</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">193</span><span id="line-193"></span>
+<span class="source-line-no">194</span><span id="line-194"> /**</span>
+<span class="source-line-no">195</span><span id="line-195"> * Make puts to put the input value into each combination of row, family, and qualifier</span>
+<span class="source-line-no">196</span><span id="line-196"> */</span>
+<span class="source-line-no">197</span><span id="line-197"> static ArrayList<Put> createPuts(byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
+<span class="source-line-no">198</span><span id="line-198"> byte[] value) throws IOException {</span>
+<span class="source-line-no">199</span><span id="line-199"> Put put;</span>
+<span class="source-line-no">200</span><span id="line-200"> ArrayList<Put> puts = new ArrayList<>();</span>
+<span class="source-line-no">201</span><span id="line-201"></span>
+<span class="source-line-no">202</span><span id="line-202"> for (int row = 0; row < rows.length; row++) {</span>
+<span class="source-line-no">203</span><span id="line-203"> put = new Put(rows[row]);</span>
+<span class="source-line-no">204</span><span id="line-204"> for (int fam = 0; fam < families.length; fam++) {</span>
+<span class="source-line-no">205</span><span id="line-205"> for (int qual = 0; qual < qualifiers.length; qual++) {</span>
+<span class="source-line-no">206</span><span id="line-206"> KeyValue kv = new KeyValue(rows[row], families[fam], qualifiers[qual], qual, value);</span>
+<span class="source-line-no">207</span><span id="line-207"> put.add(kv);</span>
+<span class="source-line-no">208</span><span id="line-208"> }</span>
+<span class="source-line-no">209</span><span id="line-209"> }</span>
+<span class="source-line-no">210</span><span id="line-210"> puts.add(put);</span>
+<span class="source-line-no">211</span><span id="line-211"> }</span>
+<span class="source-line-no">212</span><span id="line-212"></span>
+<span class="source-line-no">213</span><span id="line-213"> return puts;</span>
+<span class="source-line-no">214</span><span id="line-214"> }</span>
+<span class="source-line-no">215</span><span id="line-215"></span>
+<span class="source-line-no">216</span><span id="line-216"> @AfterAll</span>
+<span class="source-line-no">217</span><span id="line-217"> public static void tearDownAfterClass() throws Exception {</span>
+<span class="source-line-no">218</span><span id="line-218"> Closeables.close(CONN, true);</span>
+<span class="source-line-no">219</span><span id="line-219"> TEST_UTIL.shutdownMiniCluster();</span>
<span class="source-line-no">220</span><span id="line-220"> }</span>
<span class="source-line-no">221</span><span id="line-221"></span>
-<span class="source-line-no">222</span><span id="line-222"> @AfterClass</span>
-<span class="source-line-no">223</span><span id="line-223"> public static void tearDownAfterClass() throws Exception {</span>
-<span class="source-line-no">224</span><span id="line-224"> Closeables.close(CONN, true);</span>
-<span class="source-line-no">225</span><span id="line-225"> TEST_UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">226</span><span id="line-226"> }</span>
-<span class="source-line-no">227</span><span id="line-227"></span>
-<span class="source-line-no">228</span><span id="line-228"> @Before</span>
-<span class="source-line-no">229</span><span id="line-229"> public void setupBeforeTest() throws Exception {</span>
-<span class="source-line-no">230</span><span id="line-230"> disableSleeping();</span>
-<span class="source-line-no">231</span><span id="line-231"> }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233"> @After</span>
-<span class="source-line-no">234</span><span id="line-234"> public void teardownAfterTest() throws Exception {</span>
-<span class="source-line-no">235</span><span id="line-235"> disableSleeping();</span>
-<span class="source-line-no">236</span><span id="line-236"> }</span>
-<span class="source-line-no">237</span><span id="line-237"></span>
-<span class="source-line-no">238</span><span id="line-238"> /**</span>
-<span class="source-line-no">239</span><span id="line-239"> * Run the test callable when heartbeats are enabled/disabled. We expect all tests to only pass</span>
-<span class="source-line-no">240</span><span id="line-240"> * when heartbeat messages are enabled (otherwise the test is pointless). When heartbeats are</span>
-<span class="source-line-no">241</span><span id="line-241"> * disabled, the test should throw an exception.</span>
-<span class="source-line-no">242</span><span id="line-242"> */</span>
-<span class="source-line-no">243</span><span id="line-243"> private void testImportanceOfHeartbeats(Callable<Void> testCallable) throws InterruptedException {</span>
-<span class="source-line-no">244</span><span id="line-244"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
-<span class="source-line-no">245</span><span id="line-245"></span>
-<span class="source-line-no">246</span><span id="line-246"> try {</span>
-<span class="source-line-no">247</span><span id="line-247"> testCallable.call();</span>
-<span class="source-line-no">248</span><span id="line-248"> } catch (Exception e) {</span>
-<span class="source-line-no">249</span><span id="line-249"> fail("Heartbeat messages are enabled, exceptions should NOT be thrown. Exception trace:"</span>
-<span class="source-line-no">250</span><span id="line-250"> + ExceptionUtils.getStackTrace(e));</span>
-<span class="source-line-no">251</span><span id="line-251"> }</span>
-<span class="source-line-no">252</span><span id="line-252"></span>
-<span class="source-line-no">253</span><span id="line-253"> HeartbeatRPCServices.heartbeatsEnabled = false;</span>
-<span class="source-line-no">254</span><span id="line-254"> try {</span>
-<span class="source-line-no">255</span><span id="line-255"> testCallable.call();</span>
-<span class="source-line-no">256</span><span id="line-256"> } catch (Exception e) {</span>
-<span class="source-line-no">257</span><span id="line-257"> return;</span>
-<span class="source-line-no">258</span><span id="line-258"> } finally {</span>
-<span class="source-line-no">259</span><span id="line-259"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
-<span class="source-line-no">260</span><span id="line-260"> }</span>
-<span class="source-line-no">261</span><span id="line-261"> fail("Heartbeats messages are disabled, an exception should be thrown. If an exception "</span>
-<span class="source-line-no">262</span><span id="line-262"> + " is not thrown, the test case is not testing the importance of heartbeat messages");</span>
-<span class="source-line-no">263</span><span id="line-263"> }</span>
-<span class="source-line-no">264</span><span id="line-264"></span>
-<span class="source-line-no">265</span><span id="line-265"> /**</span>
-<span class="source-line-no">266</span><span id="line-266"> * Test the case that the time limit for the scan is reached after each full row of cells is</span>
-<span class="source-line-no">267</span><span id="line-267"> * fetched.</span>
-<span class="source-line-no">268</span><span id="line-268"> */</span>
-<span class="source-line-no">269</span><span id="line-269"> @Test</span>
-<span class="source-line-no">270</span><span id="line-270"> public void testHeartbeatBetweenRows() throws Exception {</span>
-<span class="source-line-no">271</span><span id="line-271"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">272</span><span id="line-272"></span>
-<span class="source-line-no">273</span><span id="line-273"> @Override</span>
-<span class="source-line-no">274</span><span id="line-274"> public Void call() throws Exception {</span>
-<span class="source-line-no">275</span><span id="line-275"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
-<span class="source-line-no">276</span><span id="line-276"> // the case where a scan stops on the server side due to a time limit</span>
-<span class="source-line-no">277</span><span id="line-277"> Scan scan = new Scan();</span>
-<span class="source-line-no">278</span><span id="line-278"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">279</span><span id="line-279"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">222</span><span id="line-222"> @BeforeEach</span>
+<span class="source-line-no">223</span><span id="line-223"> public void setupBeforeTest() throws Exception {</span>
+<span class="source-line-no">224</span><span id="line-224"> disableSleeping();</span>
+<span class="source-line-no">225</span><span id="line-225"> }</span>
+<span class="source-line-no">226</span><span id="line-226"></span>
+<span class="source-line-no">227</span><span id="line-227"> @AfterEach</span>
+<span class="source-line-no">228</span><span id="line-228"> public void teardownAfterTest() throws Exception {</span>
+<span class="source-line-no">229</span><span id="line-229"> disableSleeping();</span>
+<span class="source-line-no">230</span><span id="line-230"> }</span>
+<span class="source-line-no">231</span><span id="line-231"></span>
+<span class="source-line-no">232</span><span id="line-232"> /**</span>
+<span class="source-line-no">233</span><span id="line-233"> * Run the test callable when heartbeats are enabled/disabled. We expect all tests to only pass</span>
+<span class="source-line-no">234</span><span id="line-234"> * when heartbeat messages are enabled (otherwise the test is pointless). When heartbeats are</span>
+<span class="source-line-no">235</span><span id="line-235"> * disabled, the test should throw an exception.</span>
+<span class="source-line-no">236</span><span id="line-236"> */</span>
+<span class="source-line-no">237</span><span id="line-237"> private void testImportanceOfHeartbeats(Callable<Void> testCallable) throws InterruptedException {</span>
+<span class="source-line-no">238</span><span id="line-238"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
+<span class="source-line-no">239</span><span id="line-239"></span>
+<span class="source-line-no">240</span><span id="line-240"> try {</span>
+<span class="source-line-no">241</span><span id="line-241"> testCallable.call();</span>
+<span class="source-line-no">242</span><span id="line-242"> } catch (Exception e) {</span>
+<span class="source-line-no">243</span><span id="line-243"> fail("Heartbeat messages are enabled, exceptions should NOT be thrown. Exception trace:"</span>
+<span class="source-line-no">244</span><span id="line-244"> + ExceptionUtils.getStackTrace(e));</span>
+<span class="source-line-no">245</span><span id="line-245"> }</span>
+<span class="source-line-no">246</span><span id="line-246"></span>
+<span class="source-line-no">247</span><span id="line-247"> HeartbeatRPCServices.heartbeatsEnabled = false;</span>
+<span class="source-line-no">248</span><span id="line-248"> try {</span>
+<span class="source-line-no">249</span><span id="line-249"> testCallable.call();</span>
+<span class="source-line-no">250</span><span id="line-250"> } catch (Exception e) {</span>
+<span class="source-line-no">251</span><span id="line-251"> return;</span>
+<span class="source-line-no">252</span><span id="line-252"> } finally {</span>
+<span class="source-line-no">253</span><span id="line-253"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
+<span class="source-line-no">254</span><span id="line-254"> }</span>
+<span class="source-line-no">255</span><span id="line-255"> fail("Heartbeats messages are disabled, an exception should be thrown. If an exception "</span>
+<span class="source-line-no">256</span><span id="line-256"> + " is not thrown, the test case is not testing the importance of heartbeat messages");</span>
+<span class="source-line-no">257</span><span id="line-257"> }</span>
+<span class="source-line-no">258</span><span id="line-258"></span>
+<span class="source-line-no">259</span><span id="line-259"> /**</span>
+<span class="source-line-no">260</span><span id="line-260"> * Test the case that the time limit for the scan is reached after each full row of cells is</span>
+<span class="source-line-no">261</span><span id="line-261"> * fetched.</span>
+<span class="source-line-no">262</span><span id="line-262"> */</span>
+<span class="source-line-no">263</span><span id="line-263"> @Test</span>
+<span class="source-line-no">264</span><span id="line-264"> public void testHeartbeatBetweenRows() throws Exception {</span>
+<span class="source-line-no">265</span><span id="line-265"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">266</span><span id="line-266"></span>
+<span class="source-line-no">267</span><span id="line-267"> @Override</span>
+<span class="source-line-no">268</span><span id="line-268"> public Void call() throws Exception {</span>
+<span class="source-line-no">269</span><span id="line-269"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
+<span class="source-line-no">270</span><span id="line-270"> // the case where a scan stops on the server side due to a time limit</span>
+<span class="source-line-no">271</span><span id="line-271"> Scan scan = new Scan();</span>
+<span class="source-line-no">272</span><span id="line-272"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">273</span><span id="line-273"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">274</span><span id="line-274"></span>
+<span class="source-line-no">275</span><span id="line-275"> testEquivalenceOfScanWithHeartbeats(scan, DEFAULT_ROW_SLEEP_TIME, -1, false);</span>
+<span class="source-line-no">276</span><span id="line-276"> return null;</span>
+<span class="source-line-no">277</span><span id="line-277"> }</span>
+<span class="source-line-no">278</span><span id="line-278"> });</span>
+<span class="source-line-no">279</span><span id="line-279"> }</span>
<span class="source-line-no">280</span><span id="line-280"></span>
-<span class="source-line-no">281</span><span id="line-281"> testEquivalenceOfScanWithHeartbeats(scan, DEFAULT_ROW_SLEEP_TIME, -1, false);</span>
-<span class="source-line-no">282</span><span id="line-282"> return null;</span>
-<span class="source-line-no">283</span><span id="line-283"> }</span>
-<span class="source-line-no">284</span><span id="line-284"> });</span>
-<span class="source-line-no">285</span><span id="line-285"> }</span>
-<span class="source-line-no">286</span><span id="line-286"></span>
-<span class="source-line-no">287</span><span id="line-287"> /**</span>
-<span class="source-line-no">288</span><span id="line-288"> * Test the case that the time limit for scans is reached in between column families</span>
-<span class="source-line-no">289</span><span id="line-289"> */</span>
-<span class="source-line-no">290</span><span id="line-290"> @Test</span>
-<span class="source-line-no">291</span><span id="line-291"> public void testHeartbeatBetweenColumnFamilies() throws Exception {</span>
-<span class="source-line-no">292</span><span id="line-292"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">293</span><span id="line-293"> @Override</span>
-<span class="source-line-no">294</span><span id="line-294"> public Void call() throws Exception {</span>
-<span class="source-line-no">295</span><span id="line-295"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
-<span class="source-line-no">296</span><span id="line-296"> // the case where a scan stops on the server side due to a time limit</span>
-<span class="source-line-no">297</span><span id="line-297"> Scan baseScan = new Scan();</span>
-<span class="source-line-no">298</span><span id="line-298"> baseScan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">299</span><span id="line-299"> baseScan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">300</span><span id="line-300"></span>
-<span class="source-line-no">301</span><span id="line-301"> // Copy the scan before each test. When a scan object is used by a scanner, some of its</span>
-<span class="source-line-no">302</span><span id="line-302"> // fields may be changed such as start row</span>
-<span class="source-line-no">303</span><span id="line-303"> Scan scanCopy = new Scan(baseScan);</span>
-<span class="source-line-no">304</span><span id="line-304"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, false);</span>
-<span class="source-line-no">305</span><span id="line-305"> scanCopy = new Scan(baseScan);</span>
-<span class="source-line-no">306</span><span id="line-306"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, true);</span>
-<span class="source-line-no">307</span><span id="line-307"> return null;</span>
-<span class="source-line-no">308</span><span id="line-308"> }</span>
-<span class="source-line-no">309</span><span id="line-309"> });</span>
-<span class="source-line-no">310</span><span id="line-310"> }</span>
-<span class="source-line-no">311</span><span id="line-311"></span>
-<span class="source-line-no">312</span><span id="line-312"> public static class SparseCellFilter extends FilterBase {</span>
-<span class="source-line-no">313</span><span id="line-313"></span>
-<span class="source-line-no">314</span><span id="line-314"> @Override</span>
-<span class="source-line-no">315</span><span id="line-315"> public ReturnCode filterCell(final Cell v) throws IOException {</span>
-<span class="source-line-no">316</span><span id="line-316"> try {</span>
-<span class="source-line-no">317</span><span id="line-317"> Thread.sleep(CLIENT_TIMEOUT / 2 + 100);</span>
-<span class="source-line-no">318</span><span id="line-318"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">319</span><span id="line-319"> Thread.currentThread().interrupt();</span>
-<span class="source-line-no">320</span><span id="line-320"> }</span>
-<span class="source-line-no">321</span><span id="line-321"> return Bytes.equals(CellUtil.cloneRow(v), ROWS[NUM_ROWS - 1])</span>
-<span class="source-line-no">322</span><span id="line-322"> ? ReturnCode.INCLUDE</span>
-<span class="source-line-no">323</span><span id="line-323"> : ReturnCode.SKIP;</span>
-<span class="source-line-no">324</span><span id="line-324"> }</span>
-<span class="source-line-no">325</span><span id="line-325"></span>
-<span class="source-line-no">326</span><span id="line-326"> public static Filter parseFrom(final byte[] pbBytes) {</span>
-<span class="source-line-no">327</span><span id="line-327"> return new SparseCellFilter();</span>
-<span class="source-line-no">328</span><span id="line-328"> }</span>
-<span class="source-line-no">329</span><span id="line-329"> }</span>
-<span class="source-line-no">330</span><span id="line-330"></span>
-<span class="source-line-no">331</span><span id="line-331"> public static class SparseRowFilter extends FilterBase {</span>
-<span class="source-line-no">332</span><span id="line-332"></span>
-<span class="source-line-no">333</span><span id="line-333"> @Override</span>
-<span class="source-line-no">334</span><span id="line-334"> public boolean filterRowKey(Cell cell) throws IOException {</span>
-<span class="source-line-no">335</span><span id="line-335"> try {</span>
-<span class="source-line-no">336</span><span id="line-336"> Thread.sleep(CLIENT_TIMEOUT / 2 - 100);</span>
-<span class="source-line-no">337</span><span id="line-337"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">338</span><span id="line-338"> Thread.currentThread().interrupt();</span>
-<span class="source-line-no">339</span><span id="line-339"> }</span>
-<span class="source-line-no">340</span><span id="line-340"> return !Bytes.equals(CellUtil.cloneRow(cell), ROWS[NUM_ROWS - 1]);</span>
-<span class="source-line-no">341</span><span id="line-341"> }</span>
-<span class="source-line-no">342</span><span id="line-342"></span>
-<span class="source-line-no">343</span><span id="line-343"> public static Filter parseFrom(final byte[] pbBytes) {</span>
-<span class="source-line-no">344</span><span id="line-344"> return new SparseRowFilter();</span>
-<span class="source-line-no">345</span><span id="line-345"> }</span>
-<span class="source-line-no">346</span><span id="line-346"> }</span>
-<span class="source-line-no">347</span><span id="line-347"></span>
-<span class="source-line-no">348</span><span id="line-348"> /**</span>
-<span class="source-line-no">349</span><span id="line-349"> * Test the case that there is a filter which filters most of cells</span>
-<span class="source-line-no">350</span><span id="line-350"> */</span>
-<span class="source-line-no">351</span><span id="line-351"> @Test</span>
-<span class="source-line-no">352</span><span id="line-352"> public void testHeartbeatWithSparseCellFilter() throws Exception {</span>
-<span class="source-line-no">353</span><span id="line-353"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">354</span><span id="line-354"> @Override</span>
-<span class="source-line-no">355</span><span id="line-355"> public Void call() throws Exception {</span>
-<span class="source-line-no">356</span><span id="line-356"> Scan scan = new Scan();</span>
-<span class="source-line-no">357</span><span id="line-357"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">358</span><span id="line-358"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">359</span><span id="line-359"> scan.setFilter(new SparseCellFilter());</span>
-<span class="source-line-no">360</span><span id="line-360"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">361</span><span id="line-361"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">362</span><span id="line-362"> int num = 0;</span>
-<span class="source-line-no">363</span><span id="line-363"> while (scanner.next() != null) {</span>
-<span class="source-line-no">364</span><span id="line-364"> num++;</span>
-<span class="source-line-no">365</span><span id="line-365"> }</span>
-<span class="source-line-no">366</span><span id="line-366"> assertEquals(1, num);</span>
-<span class="source-line-no">367</span><span id="line-367"> }</span>
-<span class="source-line-no">368</span><span id="line-368"></span>
-<span class="source-line-no">369</span><span id="line-369"> scan = new Scan();</span>
-<span class="source-line-no">370</span><span id="line-370"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">371</span><span id="line-371"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">372</span><span id="line-372"> scan.setFilter(new SparseCellFilter());</span>
-<span class="source-line-no">373</span><span id="line-373"> scan.setAllowPartialResults(true);</span>
-<span class="source-line-no">374</span><span id="line-374"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">375</span><span id="line-375"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">376</span><span id="line-376"> int num = 0;</span>
-<span class="source-line-no">377</span><span id="line-377"> while (scanner.next() != null) {</span>
-<span class="source-line-no">378</span><span id="line-378"> num++;</span>
-<span class="source-line-no">379</span><span id="line-379"> }</span>
-<span class="source-line-no">380</span><span id="line-380"> assertEquals(NUM_FAMILIES * NUM_QUALIFIERS, num);</span>
-<span class="source-line-no">381</span><span id="line-381"> }</span>
-<span class="source-line-no">382</span><span id="line-382"></span>
-<span class="source-line-no">383</span><span id="line-383"> return null;</span>
-<span class="source-line-no">384</span><span id="line-384"> }</span>
-<span class="source-line-no">385</span><span id="line-385"> });</span>
-<span class="source-line-no">386</span><span id="line-386"> }</span>
-<span class="source-line-no">387</span><span id="line-387"></span>
-<span class="source-line-no">388</span><span id="line-388"> /**</span>
-<span class="source-line-no">389</span><span id="line-389"> * Test the case that there is a filter which filters most of rows</span>
-<span class="source-line-no">390</span><span id="line-390"> */</span>
-<span class="source-line-no">391</span><span id="line-391"> @Test</span>
-<span class="source-line-no">392</span><span id="line-392"> public void testHeartbeatWithSparseRowFilter() throws Exception {</span>
-<span class="source-line-no">393</span><span id="line-393"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">394</span><span id="line-394"> @Override</span>
-<span class="source-line-no">395</span><span id="line-395"> public Void call() throws Exception {</span>
-<span class="source-line-no">396</span><span id="line-396"> Scan scan = new Scan();</span>
-<span class="source-line-no">397</span><span id="line-397"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">398</span><span id="line-398"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">399</span><span id="line-399"> scan.setFilter(new SparseRowFilter());</span>
-<span class="source-line-no">400</span><span id="line-400"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">401</span><span id="line-401"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">402</span><span id="line-402"> int num = 0;</span>
-<span class="source-line-no">403</span><span id="line-403"> while (scanner.next() != null) {</span>
-<span class="source-line-no">404</span><span id="line-404"> num++;</span>
-<span class="source-line-no">405</span><span id="line-405"> }</span>
-<span class="source-line-no">406</span><span id="line-406"> assertEquals(1, num);</span>
-<span class="source-line-no">407</span><span id="line-407"> }</span>
-<span class="source-line-no">408</span><span id="line-408"></span>
-<span class="source-line-no">409</span><span id="line-409"> return null;</span>
-<span class="source-line-no">410</span><span id="line-410"> }</span>
-<span class="source-line-no">411</span><span id="line-411"> });</span>
-<span class="source-line-no">412</span><span id="line-412"> }</span>
-<span class="source-line-no">413</span><span id="line-413"></span>
-<span class="source-line-no">414</span><span id="line-414"> /**</span>
-<span class="source-line-no">415</span><span id="line-415"> * Test the equivalence of a scan versus the same scan executed when heartbeat messages are</span>
-<span class="source-line-no">416</span><span id="line-416"> * necessary</span>
-<span class="source-line-no">417</span><span id="line-417"> * @param scan The scan configuration being tested</span>
-<span class="source-line-no">418</span><span id="line-418"> * @param rowSleepTime The time to sleep between fetches of row cells</span>
-<span class="source-line-no">419</span><span id="line-419"> * @param cfSleepTime The time to sleep between fetches of column family cells</span>
-<span class="source-line-no">420</span><span id="line-420"> * @param sleepBeforeCf set to true when column family sleeps should occur before the cells for</span>
-<span class="source-line-no">421</span><span id="line-421"> * that column family are fetched</span>
-<span class="source-line-no">422</span><span id="line-422"> */</span>
-<span class="source-line-no">423</span><span id="line-423"> private void testEquivalenceOfScanWithHeartbeats(final Scan scan, int rowSleepTime,</span>
-<span class="source-line-no">424</span><span id="line-424"> int cfSleepTime, boolean sleepBeforeCf) throws Exception {</span>
-<span class="source-line-no">425</span><span id="line-425"> disableSleeping();</span>
-<span class="source-line-no">426</span><span id="line-426"> AsyncTable<AdvancedScanResultConsumer> table = CONN.getTable(TABLE_NAME);</span>
-<span class="source-line-no">427</span><span id="line-427"> final ResultScanner scanner = new ScanPerNextResultScanner(table, scan);</span>
-<span class="source-line-no">428</span><span id="line-428"> final ResultScanner scannerWithHeartbeats = new ScanPerNextResultScanner(table, scan);</span>
-<span class="source-line-no">429</span><span id="line-429"></span>
-<span class="source-line-no">430</span><span id="line-430"> Result r1 = null;</span>
-<span class="source-line-no">431</span><span id="line-431"> Result r2 = null;</span>
+<span class="source-line-no">281</span><span id="line-281"> /**</span>
+<span class="source-line-no">282</span><span id="line-282"> * Test the case that the time limit for scans is reached in between column families</span>
+<span class="source-line-no">283</span><span id="line-283"> */</span>
+<span class="source-line-no">284</span><span id="line-284"> @Test</span>
+<span class="source-line-no">285</span><span id="line-285"> public void testHeartbeatBetweenColumnFamilies() throws Exception {</span>
+<span class="source-line-no">286</span><span id="line-286"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">287</span><span id="line-287"> @Override</span>
+<span class="source-line-no">288</span><span id="line-288"> public Void call() throws Exception {</span>
+<span class="source-line-no">289</span><span id="line-289"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
+<span class="source-line-no">290</span><span id="line-290"> // the case where a scan stops on the server side due to a time limit</span>
+<span class="source-line-no">291</span><span id="line-291"> Scan baseScan = new Scan();</span>
+<span class="source-line-no">292</span><span id="line-292"> baseScan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">293</span><span id="line-293"> baseScan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">294</span><span id="line-294"></span>
+<span class="source-line-no">295</span><span id="line-295"> // Copy the scan before each test. When a scan object is used by a scanner, some of its</span>
+<span class="source-line-no">296</span><span id="line-296"> // fields may be changed such as start row</span>
+<span class="source-line-no">297</span><span id="line-297"> Scan scanCopy = new Scan(baseScan);</span>
+<span class="source-line-no">298</span><span id="line-298"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, false);</span>
+<span class="source-line-no">299</span><span id="line-299"> scanCopy = new Scan(baseScan);</span>
+<span class="source-line-no">300</span><span id="line-300"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, true);</span>
+<span class="source-line-no">301</span><span id="line-301"> return null;</span>
+<span class="source-line-no">302</span><span id="line-302"> }</span>
+<span class="source-line-no">303</span><span id="line-303"> });</span>
+<span class="source-line-no">304</span><span id="line-304"> }</span>
+<span class="source-line-no">305</span><span id="line-305"></span>
+<span class="source-line-no">306</span><span id="line-306"> public static class SparseCellFilter extends FilterBase {</span>
+<span class="source-line-no">307</span><span id="line-307"></span>
+<span class="source-line-no">308</span><span id="line-308"> @Override</span>
+<span class="source-line-no">309</span><span id="line-309"> public ReturnCode filterCell(final Cell v) throws IOException {</span>
+<span class="source-line-no">310</span><span id="line-310"> try {</span>
+<span class="source-line-no">311</span><span id="line-311"> Thread.sleep(CLIENT_TIMEOUT / 2 + 100);</span>
+<span class="source-line-no">312</span><span id="line-312"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">313</span><span id="line-313"> Thread.currentThread().interrupt();</span>
+<span class="source-line-no">314</span><span id="line-314"> }</span>
+<span class="source-line-no">315</span><span id="line-315"> return Bytes.equals(CellUtil.cloneRow(v), ROWS[NUM_ROWS - 1])</span>
+<span class="source-line-no">316</span><span id="line-316"> ? ReturnCode.INCLUDE</span>
+<span class="source-line-no">317</span><span id="line-317"> : ReturnCode.SKIP;</span>
+<span class="source-line-no">318</span><span id="line-318"> }</span>
+<span class="source-line-no">319</span><span id="line-319"></span>
+<span class="source-line-no">320</span><span id="line-320"> public static Filter parseFrom(final byte[] pbBytes) {</span>
+<span class="source-line-no">321</span><span id="line-321"> return new SparseCellFilter();</span>
+<span class="source-line-no">322</span><span id="line-322"> }</span>
+<span class="source-line-no">323</span><span id="line-323"> }</span>
+<span class="source-line-no">324</span><span id="line-324"></span>
+<span class="source-line-no">325</span><span id="line-325"> public static class SparseRowFilter extends FilterBase {</span>
+<span class="source-line-no">326</span><span id="line-326"></span>
+<span class="source-line-no">327</span><span id="line-327"> @Override</span>
+<span class="source-line-no">328</span><span id="line-328"> public boolean filterRowKey(Cell cell) throws IOException {</span>
+<span class="source-line-no">329</span><span id="line-329"> try {</span>
+<span class="source-line-no">330</span><span id="line-330"> Thread.sleep(CLIENT_TIMEOUT / 2 - 100);</span>
+<span class="source-line-no">331</span><span id="line-331"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">332</span><span id="line-332"> Thread.currentThread().interrupt();</span>
+<span class="source-line-no">333</span><span id="line-333"> }</span>
+<span class="source-line-no">334</span><span id="line-334"> return !Bytes.equals(CellUtil.cloneRow(cell), ROWS[NUM_ROWS - 1]);</span>
+<span class="source-line-no">335</span><span id="line-335"> }</span>
+<span class="source-line-no">336</span><span id="line-336"></span>
+<span class="source-line-no">337</span><span id="line-337"> public static Filter parseFrom(final byte[] pbBytes) {</span>
+<span class="source-line-no">338</span><span id="line-338"> return new SparseRowFilter();</span>
+<span class="source-line-no">339</span><span id="line-339"> }</span>
+<span class="source-line-no">340</span><span id="line-340"> }</span>
+<span class="source-line-no">341</span><span id="line-341"></span>
+<span class="source-line-no">342</span><span id="line-342"> /**</span>
+<span class="source-line-no">343</span><span id="line-343"> * Test the case that there is a filter which filters most of cells</span>
+<span class="source-line-no">344</span><span id="line-344"> */</span>
+<span class="source-line-no">345</span><span id="line-345"> @Test</span>
+<span class="source-line-no">346</span><span id="line-346"> public void testHeartbeatWithSparseCellFilter() throws Exception {</span>
+<span class="source-line-no">347</span><span id="line-347"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">348</span><span id="line-348"> @Override</span>
+<span class="source-line-no">349</span><span id="line-349"> public Void call() throws Exception {</span>
+<span class="source-line-no">350</span><span id="line-350"> Scan scan = new Scan();</span>
+<span class="source-line-no">351</span><span id="line-351"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">352</span><span id="line-352"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">353</span><span id="line-353"> scan.setFilter(new SparseCellFilter());</span>
+<span class="source-line-no">354</span><span id="line-354"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">355</span><span id="line-355"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">356</span><span id="line-356"> int num = 0;</span>
+<span class="source-line-no">357</span><span id="line-357"> while (scanner.next() != null) {</span>
+<span class="source-line-no">358</span><span id="line-358"> num++;</span>
+<span class="source-line-no">359</span><span id="line-359"> }</span>
+<span class="source-line-no">360</span><span id="line-360"> assertEquals(1, num);</span>
+<span class="source-line-no">361</span><span id="line-361"> }</span>
+<span class="source-line-no">362</span><span id="line-362"></span>
+<span class="source-line-no">363</span><span id="line-363"> scan = new Scan();</span>
+<span class="source-line-no">364</span><span id="line-364"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">365</span><span id="line-365"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">366</span><span id="line-366"> scan.setFilter(new SparseCellFilter());</span>
+<span class="source-line-no">367</span><span id="line-367"> scan.setAllowPartialResults(true);</span>
+<span class="source-line-no">368</span><span id="line-368"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">369</span><span id="line-369"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">370</span><span id="line-370"> int num = 0;</span>
+<span class="source-line-no">371</span><span id="line-371"> while (scanner.next() != null) {</span>
+<span class="source-line-no">372</span><span id="line-372"> num++;</span>
+<span class="source-line-no">373</span><span id="line-373"> }</span>
+<span class="source-line-no">374</span><span id="line-374"> assertEquals(NUM_FAMILIES * NUM_QUALIFIERS, num);</span>
+<span class="source-line-no">375</span><span id="line-375"> }</span>
+<span class="source-line-no">376</span><span id="line-376"></span>
+<span class="source-line-no">377</span><span id="line-377"> return null;</span>
+<span class="source-line-no">378</span><span id="line-378"> }</span>
+<span class="source-line-no">379</span><span id="line-379"> });</span>
+<span class="source-line-no">380</span><span id="line-380"> }</span>
+<span class="source-line-no">381</span><span id="line-381"></span>
+<span class="source-line-no">382</span><span id="line-382"> /**</span>
+<span class="source-line-no">383</span><span id="line-383"> * Test the case that there is a filter which filters most of rows</span>
+<span class="source-line-no">384</span><span id="line-384"> */</span>
+<span class="source-line-no">385</span><span id="line-385"> @Test</span>
+<span class="source-line-no">386</span><span id="line-386"> public void testHeartbeatWithSparseRowFilter() throws Exception {</span>
+<span class="source-line-no">387</span><span id="line-387"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">388</span><span id="line-388"> @Override</span>
+<span class="source-line-no">389</span><span id="line-389"> public Void call() throws Exception {</span>
+<span class="source-line-no">390</span><span id="line-390"> Scan scan = new Scan();</span>
+<span class="source-line-no">391</span><span id="line-391"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">392</span><span id="line-392"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">393</span><span id="line-393"> scan.setFilter(new SparseRowFilter());</span>
+<span class="source-line-no">394</span><span id="line-394"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">395</span><span id="line-395"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">396</span><span id="line-396"> int num = 0;</span>
+<span class="source-line-no">397</span><span id="line-397"> while (scanner.next() != null) {</span>
+<span class="source-line-no">398</span><span id="line-398"> num++;</span>
+<span class="source-line-no">399</span><span id="line-399"> }</span>
+<span class="source-line-no">400</span><span id="line-400"> assertEquals(1, num);</span>
+<span class="source-line-no">401</span><span id="line-401"> }</span>
+<span class="source-line-no">402</span><span id="line-402"></span>
+<span class="source-line-no">403</span><span id="line-403"> return null;</span>
+<span class="source-line-no">404</span><span id="line-404"> }</span>
+<span class="source-line-no">405</span><span id="line-405"> });</span>
+<span class="source-line-no">406</span><span id="line-406"> }</span>
+<span class="source-line-no">407</span><span id="line-407"></span>
+<span class="source-line-no">408</span><span id="line-408"> /**</span>
+<span class="source-line-no">409</span><span id="line-409"> * Test the equivalence of a scan versus the same scan executed when heartbeat messages are</span>
+<span class="source-line-no">410</span><span id="line-410"> * necessary</span>
+<span class="source-line-no">411</span><span id="line-411"> * @param scan The scan configuration being tested</span>
+<span class="source-line-no">412</span><span id="line-412"> * @param rowSleepTime The time to sleep between fetches of row cells</span>
+<span class="source-line-no">413</span><span id="line-413"> * @param cfSleepTime The time to sleep between fetches of column family cells</span>
+<span class="source-line-no">414</span><span id="line-414"> * @param sleepBeforeCf set to true when column family sleeps should occur before the cells for</span>
+<span class="source-line-no">415</span><span id="line-415"> * that column family are fetched</span>
+<span class="source-line-no">416</span><span id="line-416"> */</span>
+<span class="source-line-no">417</span><span id="line-417"> private void testEquivalenceOfScanWithHeartbeats(final Scan scan, int rowSleepTime,</span>
+<span class="source-line-no">418</span><span id="line-418"> int cfSleepTime, boolean sleepBeforeCf) throws Exception {</span>
+<span class="source-line-no">419</span><span id="line-419"> disableSleeping();</span>
+<span class="source-line-no">420</span><span id="line-420"> AsyncTable<AdvancedScanResultConsumer> table = CONN.getTable(TABLE_NAME);</span>
+<span class="source-line-no">421</span><span id="line-421"> final ResultScanner scanner = new ScanPerNextResultScanner(table, scan);</span>
+<span class="source-line-no">422</span><span id="line-422"> final ResultScanner scannerWithHeartbeats = new ScanPerNextResultScanner(table, scan);</span>
+<span class="source-line-no">423</span><span id="line-423"></span>
+<span class="source-line-no">424</span><span id="line-424"> Result r1 = null;</span>
+<span class="source-line-no">425</span><span id="line-425"> Result r2 = null;</span>
+<span class="source-line-no">426</span><span id="line-426"></span>
+<span class="source-line-no">427</span><span id="line-427"> while ((r1 = scanner.next()) != null) {</span>
+<span class="source-line-no">428</span><span id="line-428"> // Enforce the specified sleep conditions during calls to the heartbeat scanner</span>
+<span class="source-line-no">429</span><span id="line-429"> configureSleepTime(rowSleepTime, cfSleepTime, sleepBeforeCf);</span>
+<span class="source-line-no">430</span><span id="line-430"> r2 = scannerWithHeartbeats.next();</span>
+<span class="source-line-no">431</span><span id="line-431"> disableSleeping();</span>
<span class="source-line-no">432</span><span id="line-432"></span>
-<span class="source-line-no">433</span><span id="line-433"> while ((r1 = scanner.next()) != null) {</span>
-<span class="source-line-no">434</span><span id="line-434"> // Enforce the specified sleep conditions during calls to the heartbeat scanner</span>
-<span class="source-line-no">435</span><span id="line-435"> configureSleepTime(rowSleepTime, cfSleepTime, sleepBeforeCf);</span>
-<span class="source-line-no">436</span><span id="line-436"> r2 = scannerWithHeartbeats.next();</span>
-<span class="source-line-no">437</span><span id="line-437"> disableSleeping();</span>
-<span class="source-line-no">438</span><span id="line-438"></span>
-<span class="source-line-no">439</span><span id="line-439"> assertTrue(r2 != null);</span>
-<span class="source-line-no">440</span><span id="line-440"> try {</span>
-<span class="source-line-no">441</span><span id="line-441"> Result.compareResults(r1, r2);</span>
-<span class="source-line-no">442</span><span id="line-442"> } catch (Exception e) {</span>
-<span class="source-line-no">443</span><span id="line-443"> fail(e.getMessage());</span>
-<span class="source-line-no">444</span><span id="line-444"> }</span>
-<span class="source-line-no">445</span><span id="line-445"> }</span>
-<span class="source-line-no">446</span><span id="line-446"></span>
-<span class="source-line-no">447</span><span id="line-447"> assertTrue(scannerWithHeartbeats.next() == null);</span>
-<span class="source-line-no">448</span><span id="line-448"> scanner.close();</span>
-<span class="source-line-no">449</span><span id="line-449"> scannerWithHeartbeats.close();</span>
-<span class="source-line-no">450</span><span id="line-450"> }</span>
-<span class="source-line-no">451</span><span id="line-451"></span>
-<span class="source-line-no">452</span><span id="line-452"> /**</span>
-<span class="source-line-no">453</span><span id="line-453"> * Helper method for setting the time to sleep between rows and column families. If a sleep time</span>
-<span class="source-line-no">454</span><span id="line-454"> * is negative then that sleep will be disabled</span>
-<span class="source-line-no">455</span><span id="line-455"> */</span>
-<span class="source-line-no">456</span><span id="line-456"> private static void configureSleepTime(int rowSleepTime, int cfSleepTime, boolean sleepBeforeCf) {</span>
-<span class="source-line-no">457</span><span id="line-457"> HeartbeatHRegion.sleepBetweenRows = rowSleepTime > 0;</span>
-<span class="source-line-no">458</span><span id="line-458"> HeartbeatHRegion.rowSleepTime = rowSleepTime;</span>
-<span class="source-line-no">459</span><span id="line-459"></span>
-<span class="source-line-no">460</span><span id="line-460"> HeartbeatHRegion.sleepBetweenColumnFamilies = cfSleepTime > 0;</span>
-<span class="source-line-no">461</span><span id="line-461"> HeartbeatHRegion.columnFamilySleepTime = cfSleepTime;</span>
-<span class="source-line-no">462</span><span id="line-462"> HeartbeatHRegion.sleepBeforeColumnFamily = sleepBeforeCf;</span>
-<span class="source-line-no">463</span><span id="line-463"> }</span>
-<span class="source-line-no">464</span><span id="line-464"></span>
-<span class="source-line-no">465</span><span id="line-465"> /**</span>
-<span class="source-line-no">466</span><span id="line-466"> * Disable the sleeping mechanism server side.</span>
-<span class="source-line-no">467</span><span id="line-467"> */</span>
-<span class="source-line-no">468</span><span id="line-468"> private static void disableSleeping() {</span>
-<span class="source-line-no">469</span><span id="line-469"> HeartbeatHRegion.sleepBetweenRows = false;</span>
-<span class="source-line-no">470</span><span id="line-470"> HeartbeatHRegion.sleepBetweenColumnFamilies = false;</span>
-<span class="source-line-no">471</span><span id="line-471"> }</span>
-<span class="source-line-no">472</span><span id="line-472"></span>
-<span class="source-line-no">473</span><span id="line-473"> /**</span>
-<span class="source-line-no">474</span><span id="line-474"> * Custom HRegionServer instance that instantiates {@link HeartbeatRPCServices} in place of</span>
-<span class="source-line-no">475</span><span id="line-475"> * {@link RSRpcServices} to allow us to toggle support for heartbeat messages</span>
-<span class="source-line-no">476</span><span id="line-476"> */</span>
-<span class="source-line-no">477</span><span id="line-477"> private static class HeartbeatHRegionServer extends HRegionServer {</span>
-<span class="source-line-no">478</span><span id="line-478"> public HeartbeatHRegionServer(Configuration conf) throws IOException, InterruptedException {</span>
-<span class="source-line-no">479</span><span id="line-479"> super(conf);</span>
-<span class="source-line-no">480</span><span id="line-480"> }</span>
+<span class="source-line-no">433</span><span id="line-433"> assertTrue(r2 != null);</span>
+<span class="source-line-no">434</span><span id="line-434"> try {</span>
+<span class="source-line-no">435</span><span id="line-435"> Result.compareResults(r1, r2);</span>
+<span class="source-line-no">436</span><span id="line-436"> } catch (Exception e) {</span>
+<span class="source-line-no">437</span><span id="line-437"> fail(e.getMessage());</span>
+<span class="source-line-no">438</span><span id="line-438"> }</span>
+<span class="source-line-no">439</span><span id="line-439"> }</span>
+<span class="source-line-no">440</span><span id="line-440"></span>
+<span class="source-line-no">441</span><span id="line-441"> assertTrue(scannerWithHeartbeats.next() == null);</span>
+<span class="source-line-no">442</span><span id="line-442"> scanner.close();</span>
+<span class="source-line-no">443</span><span id="line-443"> scannerWithHeartbeats.close();</span>
+<span class="source-line-no">444</span><span id="line-444"> }</span>
+<span class="source-line-no">445</span><span id="line-445"></span>
+<span class="source-line-no">446</span><span id="line-446"> /**</span>
+<span class="source-line-no">447</span><span id="line-447"> * Helper method for setting the time to sleep between rows and column families. If a sleep time</span>
+<span class="source-line-no">448</span><span id="line-448"> * is negative then that sleep will be disabled</span>
+<span class="source-line-no">449</span><span id="line-449"> */</span>
+<span class="source-line-no">450</span><span id="line-450"> private static void configureSleepTime(int rowSleepTime, int cfSleepTime, boolean sleepBeforeCf) {</span>
+<span class="source-line-no">451</span><span id="line-451"> HeartbeatHRegion.sleepBetweenRows = rowSleepTime > 0;</span>
+<span class="source-line-no">452</span><span id="line-452"> HeartbeatHRegion.rowSleepTime = rowSleepTime;</span>
+<span class="source-line-no">453</span><span id="line-453"></span>
+<span class="source-line-no">454</span><span id="line-454"> HeartbeatHRegion.sleepBetweenColumnFamilies = cfSleepTime > 0;</span>
+<span class="source-line-no">455</span><span id="line-455"> HeartbeatHRegion.columnFamilySleepTime = cfSleepTime;</span>
+<span class="source-line-no">456</span><span id="line-456"> HeartbeatHRegion.sleepBeforeColumnFamily = sleepBeforeCf;</span>
+<span class="source-line-no">457</span><span id="line-457"> }</span>
+<span class="source-line-no">458</span><span id="line-458"></span>
+<span class="source-line-no">459</span><span id="line-459"> /**</span>
+<span class="source-line-no">460</span><span id="line-460"> * Disable the sleeping mechanism server side.</span>
+<span class="source-line-no">461</span><span id="line-461"> */</span>
+<span class="source-line-no">462</span><span id="line-462"> private static void disableSleeping() {</span>
+<span class="source-line-no">463</span><span id="line-463"> HeartbeatHRegion.sleepBetweenRows = false;</span>
+<span class="source-line-no">464</span><span id="line-464"> HeartbeatHRegion.sleepBetweenColumnFamilies = false;</span>
+<span class="source-line-no">465</span><span id="line-465"> }</span>
+<span class="source-line-no">466</span><span id="line-466"></span>
+<span class="source-line-no">467</span><span id="line-467"> /**</span>
+<span class="source-line-no">468</span><span id="line-468"> * Custom HRegionServer instance that instantiates {@link HeartbeatRPCServices} in place of</span>
+<span class="source-line-no">469</span><span id="line-469"> * {@link RSRpcServices} to allow us to toggle support for heartbeat messages</span>
+<span class="source-line-no">470</span><span id="line-470"> */</span>
+<span class="source-line-no">471</span><span id="line-471"> private static class HeartbeatHRegionServer extends HRegionServer {</span>
+<span class="source-line-no">472</span><span id="line-472"> public HeartbeatHRegionServer(Configuration conf) throws IOException, InterruptedException {</span>
+<span class="source-line-no">473</span><span id="line-473"> super(conf);</span>
+<span class="source-line-no">474</span><span id="line-474"> }</span>
+<span class="source-line-no">475</span><span id="line-475"></span>
+<span class="source-line-no">476</span><span id="line-476"> @Override</span>
+<span class="source-line-no">477</span><span id="line-477"> protected RSRpcServices createRpcServices() throws IOException {</span>
+<span class="source-line-no">478</span><span id="line-478"> return new HeartbeatRPCServices(this);</span>
+<span class="source-line-no">479</span><span id="line-479"> }</span>
+<span class="source-line-no">480</span><span id="line-480"> }</span>
<span class="source-line-no">481</span><span id="line-481"></span>
-<span class="source-line-no">482</span><span id="line-482"> @Override</span>
-<span class="source-line-no">483</span><span id="line-483"> protected RSRpcServices createRpcServices() throws IOException {</span>
-<span class="source-line-no">484</span><span id="line-484"> return new HeartbeatRPCServices(this);</span>
-<span class="source-line-no">485</span><span id="line-485"> }</span>
-<span class="source-line-no">486</span><span id="line-486"> }</span>
+<span class="source-line-no">482</span><span id="line-482"> /**</span>
+<span class="source-line-no">483</span><span id="line-483"> * Custom RSRpcServices instance that allows heartbeat support to be toggled</span>
+<span class="source-line-no">484</span><span id="line-484"> */</span>
+<span class="source-line-no">485</span><span id="line-485"> private static class HeartbeatRPCServices extends RSRpcServices {</span>
+<span class="source-line-no">486</span><span id="line-486"> private static volatile boolean heartbeatsEnabled = true;</span>
<span class="source-line-no">487</span><span id="line-487"></span>
-<span class="source-line-no">488</span><span id="line-488"> /**</span>
-<span class="source-line-no">489</span><span id="line-489"> * Custom RSRpcServices instance that allows heartbeat support to be toggled</span>
-<span class="source-line-no">490</span><span id="line-490"> */</span>
-<span class="source-line-no">491</span><span id="line-491"> private static class HeartbeatRPCServices extends RSRpcServices {</span>
-<span class="source-line-no">492</span><span id="line-492"> private static volatile boolean heartbeatsEnabled = true;</span>
-<span class="source-line-no">493</span><span id="line-493"></span>
-<span class="source-line-no">494</span><span id="line-494"> public HeartbeatRPCServices(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">495</span><span id="line-495"> super(rs);</span>
-<span class="source-line-no">496</span><span id="line-496"> }</span>
-<span class="source-line-no">497</span><span id="line-497"></span>
-<span class="source-line-no">498</span><span id="line-498"> @Override</span>
-<span class="source-line-no">499</span><span id="line-499"> public ScanResponse scan(RpcController controller, ScanRequest request)</span>
-<span class="source-line-no">500</span><span id="line-500"> throws ServiceException {</span>
-<span class="source-line-no">501</span><span id="line-501"> ScanRequest.Builder builder = ScanRequest.newBuilder(request);</span>
-<span class="source-line-no">502</span><span id="line-502"> builder.setClientHandlesHeartbeats(heartbeatsEnabled);</span>
-<span class="source-line-no">503</span><span id="line-503"> return super.scan(controller, builder.build());</span>
-<span class="source-line-no">504</span><span id="line-504"> }</span>
-<span class="source-line-no">505</span><span id="line-505"> }</span>
-<span class="source-line-no">506</span><span id="line-506"></span>
-<span class="source-line-no">507</span><span id="line-507"> /**</span>
-<span class="source-line-no">508</span><span id="line-508"> * Custom HRegion class that instantiates {@link RegionScanner}s with configurable sleep times</span>
-<span class="source-line-no">509</span><span id="line-509"> * between fetches of row Results and/or column family cells. Useful for emulating an instance</span>
-<span class="source-line-no">510</span><span id="line-510"> * where the server is taking a long time to process a client's scan request</span>
-<span class="source-line-no">511</span><span id="line-511"> */</span>
-<span class="source-line-no">512</span><span id="line-512"> private static class HeartbeatHRegion extends HRegion {</span>
-<span class="source-line-no">513</span><span id="line-513"> // Row sleeps occur AFTER each row worth of cells is retrieved.</span>
-<span class="source-line-no">514</span><span id="line-514"> private static volatile int rowSleepTime = DEFAULT_ROW_SLEEP_TIME;</span>
-<span class="source-line-no">515</span><span id="line-515"> private static volatile boolean sleepBetweenRows = false;</span>
-<span class="source-line-no">516</span><span id="line-516"></span>
-<span class="source-line-no">517</span><span id="line-517"> // The sleep for column families can be initiated before or after we fetch the cells for the</span>
-<span class="source-line-no">518</span><span id="line-518"> // column family. If the sleep occurs BEFORE then the time limits will be reached inside</span>
-<span class="source-line-no">519</span><span id="line-519"> // StoreScanner while we are fetching individual cells. If the sleep occurs AFTER then the time</span>
-<span class="source-line-no">520</span><span id="line-520"> // limit will be reached inside RegionScanner after all the cells for a column family have been</span>
-<span class="source-line-no">521</span><span id="line-521"> // retrieved.</span>
-<span class="source-line-no">522</span><span id="line-522"> private static volatile boolean sleepBeforeColumnFamily = false;</span>
-<span class="source-line-no">523</span><span id="line-523"> private static volatile int columnFamilySleepTime = DEFAULT_CF_SLEEP_TIME;</span>
-<span class="source-line-no">524</span><span id="line-524"> private static volatile boolean sleepBetweenColumnFamilies = false;</span>
-<span class="source-line-no">525</span><span id="line-525"></span>
-<span class="source-line-no">526</span><span id="line-526"> public HeartbeatHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam,</span>
-<span class="source-line-no">527</span><span id="line-527"> RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) {</span>
-<span class="source-line-no">528</span><span id="line-528"> super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices);</span>
-<span class="source-line-no">529</span><span id="line-529"> }</span>
-<span class="source-line-no">530</span><span id="line-530"></span>
-<span class="source-line-no">531</span><span id="line-531"> public HeartbeatHRegion(HRegionFileSystem fs, WAL wal, Configuration confParam,</span>
-<span class="source-line-no">532</span><span id="line-532"> TableDescriptor htd, RegionServerServices rsServices) {</span>
-<span class="source-line-no">533</span><span id="line-533"> super(fs, wal, confParam, htd, rsServices);</span>
+<span class="source-line-no">488</span><span id="line-488"> public HeartbeatRPCServices(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">489</span><span id="line-489"> super(rs);</span>
+<span class="source-line-no">490</span><span id="line-490"> }</span>
+<span class="source-line-no">491</span><span id="line-491"></span>
+<span class="source-line-no">492</span><span id="line-492"> @Override</span>
+<span class="source-line-no">493</span><span id="line-493"> public ScanResponse scan(RpcController controller, ScanRequest request)</span>
+<span class="source-line-no">494</span><span id="line-494"> throws ServiceException {</span>
+<span class="source-line-no">495</span><span id="line-495"> ScanRequest.Builder builder = ScanRequest.newBuilder(request);</span>
+<span class="source-line-no">496</span><span id="line-496"> builder.setClientHandlesHeartbeats(heartbeatsEnabled);</span>
+<span class="source-line-no">497</span><span id="line-497"> return super.scan(controller, builder.build());</span>
+<span class="source-line-no">498</span><span id="line-498"> }</span>
+<span class="source-line-no">499</span><span id="line-499"> }</span>
+<span class="source-line-no">500</span><span id="line-500"></span>
+<span class="source-line-no">501</span><span id="line-501"> /**</span>
+<span class="source-line-no">502</span><span id="line-502"> * Custom HRegion class that instantiates {@link RegionScanner}s with configurable sleep times</span>
+<span class="source-line-no">503</span><span id="line-503"> * between fetches of row Results and/or column family cells. Useful for emulating an instance</span>
+<span class="source-line-no">504</span><span id="line-504"> * where the server is taking a long time to process a client's scan request</span>
+<span class="source-line-no">505</span><span id="line-505"> */</span>
+<span class="source-line-no">506</span><span id="line-506"> private static class HeartbeatHRegion extends HRegion {</span>
+<span class="source-line-no">507</span><span id="line-507"> // Row sleeps occur AFTER each row worth of cells is retrieved.</span>
+<span class="source-line-no">508</span><span id="line-508"> private static volatile int rowSleepTime = DEFAULT_ROW_SLEEP_TIME;</span>
+<span class="source-line-no">509</span><span id="line-509"> private static volatile boolean sleepBetweenRows = false;</span>
+<span class="source-line-no">510</span><span id="line-510"></span>
+<span class="source-line-no">511</span><span id="line-511"> // The sleep for column families can be initiated before or after we fetch the cells for the</span>
+<span class="source-line-no">512</span><span id="line-512"> // column family. If the sleep occurs BEFORE then the time limits will be reached inside</span>
+<span class="source-line-no">513</span><span id="line-513"> // StoreScanner while we are fetching individual cells. If the sleep occurs AFTER then the time</span>
+<span class="source-line-no">514</span><span id="line-514"> // limit will be reached inside RegionScanner after all the cells for a column family have been</span>
+<span class="source-line-no">515</span><span id="line-515"> // retrieved.</span>
+<span class="source-line-no">516</span><span id="line-516"> private static volatile boolean sleepBeforeColumnFamily = false;</span>
+<span class="source-line-no">517</span><span id="line-517"> private static volatile int columnFamilySleepTime = DEFAULT_CF_SLEEP_TIME;</span>
+<span class="source-line-no">518</span><span id="line-518"> private static volatile boolean sleepBetweenColumnFamilies = false;</span>
+<span class="source-line-no">519</span><span id="line-519"></span>
+<span class="source-line-no">520</span><span id="line-520"> public HeartbeatHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam,</span>
+<span class="source-line-no">521</span><span id="line-521"> RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) {</span>
+<span class="source-line-no">522</span><span id="line-522"> super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices);</span>
+<span class="source-line-no">523</span><span id="line-523"> }</span>
+<span class="source-line-no">524</span><span id="line-524"></span>
+<span class="source-line-no">525</span><span id="line-525"> public HeartbeatHRegion(HRegionFileSystem fs, WAL wal, Configuration confParam,</span>
+<span class="source-line-no">526</span><span id="line-526"> TableDescriptor htd, RegionServerServices rsServices) {</span>
+<span class="source-line-no">527</span><span id="line-527"> super(fs, wal, confParam, htd, rsServices);</span>
+<span class="source-line-no">528</span><span id="line-528"> }</span>
+<span class="source-line-no">529</span><span id="line-529"></span>
+<span class="source-line-no">530</span><span id="line-530"> private static void columnFamilySleep() {</span>
+<span class="source-line-no">531</span><span id="line-531"> if (sleepBetweenColumnFamilies) {</span>
+<span class="source-line-no">532</span><span id="line-532"> Threads.sleepWithoutInterrupt(columnFamilySleepTime);</span>
+<span class="source-line-no">533</span><span id="line-533"> }</span>
<span class="source-line-no">534</span><span id="line-534"> }</span>
<span class="source-line-no">535</span><span id="line-535"></span>
-<span class="source-line-no">536</span><span id="line-536"> private static void columnFamilySleep() {</span>
-<span class="source-line-no">537</span><span id="line-537"> if (sleepBetweenColumnFamilies) {</span>
-<span class="source-line-no">538</span><span id="line-538"> Threads.sleepWithoutInterrupt(columnFamilySleepTime);</span>
+<span class="source-line-no">536</span><span id="line-536"> private static void rowSleep() {</span>
+<span class="source-line-no">537</span><span id="line-537"> if (sleepBetweenRows) {</span>
+<span class="source-line-no">538</span><span id="line-538"> Threads.sleepWithoutInterrupt(rowSleepTime);</span>
<span class="source-line-no">539</span><span id="line-539"> }</span>
<span class="source-line-no">540</span><span id="line-540"> }</span>
<span class="source-line-no">541</span><span id="line-541"></span>
-<span class="source-line-no">542</span><span id="line-542"> private static void rowSleep() {</span>
-<span class="source-line-no">543</span><span id="line-543"> if (sleepBetweenRows) {</span>
-<span class="source-line-no">544</span><span id="line-544"> Threads.sleepWithoutInterrupt(rowSleepTime);</span>
-<span class="source-line-no">545</span><span id="line-545"> }</span>
-<span class="source-line-no">546</span><span id="line-546"> }</span>
-<span class="source-line-no">547</span><span id="line-547"></span>
-<span class="source-line-no">548</span><span id="line-548"> // Instantiate the custom heartbeat region scanners</span>
-<span class="source-line-no">549</span><span id="line-549"> @Override</span>
-<span class="source-line-no">550</span><span id="line-550"> protected RegionScannerImpl instantiateRegionScanner(Scan scan,</span>
-<span class="source-line-no">551</span><span id="line-551"> List<KeyValueScanner> additionalScanners, long nonceGroup, long nonce) throws IOException {</span>
-<span class="source-line-no">552</span><span id="line-552"> if (scan.isReversed()) {</span>
-<span class="source-line-no">553</span><span id="line-553"> if (scan.getFilter() != null) {</span>
-<span class="source-line-no">554</span><span id="line-554"> scan.getFilter().setReversed(true);</span>
-<span class="source-line-no">555</span><span id="line-555"> }</span>
-<span class="source-line-no">556</span><span id="line-556"> return new HeartbeatReversedRegionScanner(scan, additionalScanners, this);</span>
-<span class="source-line-no">557</span><span id="line-557"> }</span>
-<span class="source-line-no">558</span><span id="line-558"> return new HeartbeatRegionScanner(scan, additionalScanners, this);</span>
-<span class="source-line-no">559</span><span id="line-559"> }</span>
-<span class="source-line-no">560</span><span id="line-560"> }</span>
-<span class="source-line-no">561</span><span id="line-561"></span>
-<span class="source-line-no">562</span><span id="line-562"> /**</span>
-<span class="source-line-no">563</span><span id="line-563"> * Custom ReversedRegionScanner that can be configured to sleep between retrievals of row Results</span>
-<span class="source-line-no">564</span><span id="line-564"> * and/or column family cells</span>
-<span class="source-line-no">565</span><span id="line-565"> */</span>
-<span class="source-line-no">566</span><span id="line-566"> private static class HeartbeatReversedRegionScanner extends ReversedRegionScannerImpl {</span>
-<span class="source-line-no">567</span><span id="line-567"> HeartbeatReversedRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners,</span>
-<span class="source-line-no">568</span><span id="line-568"> HRegion region) throws IOException {</span>
-<span class="source-line-no">569</span><span id="line-569"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
-<span class="source-line-no">570</span><span id="line-570"> }</span>
-<span class="source-line-no">571</span><span id="line-571"></span>
-<span class="source-line-no">572</span><span id="line-572"> @Override</span>
-<span class="source-line-no">573</span><span id="line-573"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
-<span class="source-line-no">574</span><span id="line-574"> throws IOException {</span>
-<span class="source-line-no">575</span><span id="line-575"> boolean moreRows = super.nextRaw(outResults, context);</span>
-<span class="source-line-no">576</span><span id="line-576"> HeartbeatHRegion.rowSleep();</span>
-<span class="source-line-no">577</span><span id="line-577"> return moreRows;</span>
-<span class="source-line-no">578</span><span id="line-578"> }</span>
-<span class="source-line-no">579</span><span id="line-579"></span>
-<span class="source-line-no">580</span><span id="line-580"> @Override</span>
-<span class="source-line-no">581</span><span id="line-581"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
-<span class="source-line-no">582</span><span id="line-582"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
-<span class="source-line-no">583</span><span id="line-583"> this.storeHeap =</span>
-<span class="source-line-no">584</span><span id="line-584"> new HeartbeatReversedKVHeap(scanners, (CellComparatorImpl) region.getCellComparator());</span>
-<span class="source-line-no">585</span><span id="line-585"> if (!joinedScanners.isEmpty()) {</span>
-<span class="source-line-no">586</span><span id="line-586"> this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners,</span>
-<span class="source-line-no">587</span><span id="line-587"> (CellComparatorImpl) region.getCellComparator());</span>
-<span class="source-line-no">588</span><span id="line-588"> }</span>
-<span class="source-line-no">589</span><span id="line-589"> }</span>
-<span class="source-line-no">590</span><span id="line-590"> }</span>
-<span class="source-line-no">591</span><span id="line-591"></span>
-<span class="source-line-no">592</span><span id="line-592"> /**</span>
-<span class="source-line-no">593</span><span id="line-593"> * Custom RegionScanner that can be configured to sleep between retrievals of row Results and/or</span>
-<span class="source-line-no">594</span><span id="line-594"> * column family cells</span>
-<span class="source-line-no">595</span><span id="line-595"> */</span>
-<span class="source-line-no">596</span><span id="line-596"> private static class HeartbeatRegionScanner extends RegionScannerImpl {</span>
-<span class="source-line-no">597</span><span id="line-597"> HeartbeatRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners, HRegion region)</span>
+<span class="source-line-no">542</span><span id="line-542"> // Instantiate the custom heartbeat region scanners</span>
+<span class="source-line-no">543</span><span id="line-543"> @Override</span>
+<span class="source-line-no">544</span><span id="line-544"> protected RegionScannerImpl instantiateRegionScanner(Scan scan,</span>
+<span class="source-line-no">545</span><span id="line-545"> List<KeyValueScanner> additionalScanners, long nonceGroup, long nonce) throws IOException {</span>
+<span class="source-line-no">546</span><span id="line-546"> if (scan.isReversed()) {</span>
+<span class="source-line-no">547</span><span id="line-547"> if (scan.getFilter() != null) {</span>
+<span class="source-line-no">548</span><span id="line-548"> scan.getFilter().setReversed(true);</span>
+<span class="source-line-no">549</span><span id="line-549"> }</span>
+<span class="source-line-no">550</span><span id="line-550"> return new HeartbeatReversedRegionScanner(scan, additionalScanners, this);</span>
+<span class="source-line-no">551</span><span id="line-551"> }</span>
+<span class="source-line-no">552</span><span id="line-552"> return new HeartbeatRegionScanner(scan, additionalScanners, this);</span>
+<span class="source-line-no">553</span><span id="line-553"> }</span>
+<span class="source-line-no">554</span><span id="line-554"> }</span>
+<span class="source-line-no">555</span><span id="line-555"></span>
+<span class="source-line-no">556</span><span id="line-556"> /**</span>
+<span class="source-line-no">557</span><span id="line-557"> * Custom ReversedRegionScanner that can be configured to sleep between retrievals of row Results</span>
+<span class="source-line-no">558</span><span id="line-558"> * and/or column family cells</span>
+<span class="source-line-no">559</span><span id="line-559"> */</span>
+<span class="source-line-no">560</span><span id="line-560"> private static class HeartbeatReversedRegionScanner extends ReversedRegionScannerImpl {</span>
+<span class="source-line-no">561</span><span id="line-561"> HeartbeatReversedRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners,</span>
+<span class="source-line-no">562</span><span id="line-562"> HRegion region) throws IOException {</span>
+<span class="source-line-no">563</span><span id="line-563"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
+<span class="source-line-no">564</span><span id="line-564"> }</span>
+<span class="source-line-no">565</span><span id="line-565"></span>
+<span class="source-line-no">566</span><span id="line-566"> @Override</span>
+<span class="source-line-no">567</span><span id="line-567"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
+<span class="source-line-no">568</span><span id="line-568"> throws IOException {</span>
+<span class="source-line-no">569</span><span id="line-569"> boolean moreRows = super.nextRaw(outResults, context);</span>
+<span class="source-line-no">570</span><span id="line-570"> HeartbeatHRegion.rowSleep();</span>
+<span class="source-line-no">571</span><span id="line-571"> return moreRows;</span>
+<span class="source-line-no">572</span><span id="line-572"> }</span>
+<span class="source-line-no">573</span><span id="line-573"></span>
+<span class="source-line-no">574</span><span id="line-574"> @Override</span>
+<span class="source-line-no">575</span><span id="line-575"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
+<span class="source-line-no">576</span><span id="line-576"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
+<span class="source-line-no">577</span><span id="line-577"> this.storeHeap =</span>
+<span class="source-line-no">578</span><span id="line-578"> new HeartbeatReversedKVHeap(scanners, (CellComparatorImpl) region.getCellComparator());</span>
+<span class="source-line-no">579</span><span id="line-579"> if (!joinedScanners.isEmpty()) {</span>
+<span class="source-line-no">580</span><span id="line-580"> this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners,</span>
+<span class="source-line-no">581</span><span id="line-581"> (CellComparatorImpl) region.getCellComparator());</span>
+<span class="source-line-no">582</span><span id="line-582"> }</span>
+<span class="source-line-no">583</span><span id="line-583"> }</span>
+<span class="source-line-no">584</span><span id="line-584"> }</span>
+<span class="source-line-no">585</span><span id="line-585"></span>
+<span class="source-line-no">586</span><span id="line-586"> /**</span>
+<span class="source-line-no">587</span><span id="line-587"> * Custom RegionScanner that can be configured to sleep between retrievals of row Results and/or</span>
+<span class="source-line-no">588</span><span id="line-588"> * column family cells</span>
+<span class="source-line-no">589</span><span id="line-589"> */</span>
+<span class="source-line-no">590</span><span id="line-590"> private static class HeartbeatRegionScanner extends RegionScannerImpl {</span>
+<span class="source-line-no">591</span><span id="line-591"> HeartbeatRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners, HRegion region)</span>
+<span class="source-line-no">592</span><span id="line-592"> throws IOException {</span>
+<span class="source-line-no">593</span><span id="line-593"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
+<span class="source-line-no">594</span><span id="line-594"> }</span>
+<span class="source-line-no">595</span><span id="line-595"></span>
+<span class="source-line-no">596</span><span id="line-596"> @Override</span>
+<span class="source-line-no">597</span><span id="line-597"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
<span class="source-line-no">598</span><span id="line-598"> throws IOException {</span>
-<span class="source-line-no">599</span><span id="line-599"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
-<span class="source-line-no">600</span><span id="line-600"> }</span>
-<span class="source-line-no">601</span><span id="line-601"></span>
-<span class="source-line-no">602</span><span id="line-602"> @Override</span>
-<span class="source-line-no">603</span><span id="line-603"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
-<span class="source-line-no">604</span><span id="line-604"> throws IOException {</span>
-<span class="source-line-no">605</span><span id="line-605"> boolean moreRows = super.nextRaw(outResults, context);</span>
-<span class="source-line-no">606</span><span id="line-606"> HeartbeatHRegion.rowSleep();</span>
-<span class="source-line-no">607</span><span id="line-607"> return moreRows;</span>
-<span class="source-line-no">608</span><span id="line-608"> }</span>
-<span class="source-line-no">609</span><span id="line-609"></span>
-<span class="source-line-no">610</span><span id="line-610"> @Override</span>
-<span class="source-line-no">611</span><span id="line-611"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
-<span class="source-line-no">612</span><span id="line-612"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
-<span class="source-line-no">613</span><span id="line-613"> this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());</span>
-<span class="source-line-no">614</span><span id="line-614"> if (!joinedScanners.isEmpty()) {</span>
-<span class="source-line-no">615</span><span id="line-615"> this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());</span>
-<span class="source-line-no">616</span><span id="line-616"> }</span>
-<span class="source-line-no">617</span><span id="line-617"> }</span>
-<span class="source-line-no">618</span><span id="line-618"> }</span>
-<span class="source-line-no">619</span><span id="line-619"></span>
-<span class="source-line-no">620</span><span id="line-620"> /**</span>
-<span class="source-line-no">621</span><span id="line-621"> * Custom KV Heap that can be configured to sleep/wait in between retrievals of column family</span>
-<span class="source-line-no">622</span><span id="line-622"> * cells. Useful for testing</span>
-<span class="source-line-no">623</span><span id="line-623"> */</span>
-<span class="source-line-no">624</span><span id="line-624"> private static final class HeartbeatKVHeap extends KeyValueHeap {</span>
-<span class="source-line-no">625</span><span id="line-625"> public HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator)</span>
-<span class="source-line-no">626</span><span id="line-626"> throws IOException {</span>
-<span class="source-line-no">627</span><span id="line-627"> super(scanners, comparator);</span>
-<span class="source-line-no">628</span><span id="line-628"> }</span>
-<span class="source-line-no">629</span><span id="line-629"></span>
-<span class="source-line-no">630</span><span id="line-630"> HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, KVScannerComparator comparator)</span>
+<span class="source-line-no">599</span><span id="line-599"> boolean moreRows = super.nextRaw(outResults, context);</span>
+<span class="source-line-no">600</span><span id="line-600"> HeartbeatHRegion.rowSleep();</span>
+<span class="source-line-no">601</span><span id="line-601"> return moreRows;</span>
+<span class="source-line-no">602</span><span id="line-602"> }</span>
+<span class="source-line-no">603</span><span id="line-603"></span>
+<span class="source-line-no">604</span><span id="line-604"> @Override</span>
+<span class="source-line-no">605</span><span id="line-605"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
+<span class="source-line-no">606</span><span id="line-606"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
+<span class="source-line-no">607</span><span id="line-607"> this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());</span>
+<span class="source-line-no">608</span><span id="line-608"> if (!joinedScanners.isEmpty()) {</span>
+<span class="source-line-no">609</span><span id="line-609"> this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());</span>
+<span class="source-line-no">610</span><span id="line-610"> }</span>
+<span class="source-line-no">611</span><span id="line-611"> }</span>
+<span class="source-line-no">612</span><span id="line-612"> }</span>
+<span class="source-line-no">613</span><span id="line-613"></span>
+<span class="source-line-no">614</span><span id="line-614"> /**</span>
+<span class="source-line-no">615</span><span id="line-615"> * Custom KV Heap that can be configured to sleep/wait in between retrievals of column family</span>
+<span class="source-line-no">616</span><span id="line-616"> * cells. Useful for testing</span>
+<span class="source-line-no">617</span><span id="line-617"> */</span>
+<span class="source-line-no">618</span><span id="line-618"> private static final class HeartbeatKVHeap extends KeyValueHeap {</span>
+<span class="source-line-no">619</span><span id="line-619"> public HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator)</span>
+<span class="source-line-no">620</span><span id="line-620"> throws IOException {</span>
+<span class="source-line-no">621</span><span id="line-621"> super(scanners, comparator);</span>
+<span class="source-line-no">622</span><span id="line-622"> }</span>
+<span class="source-line-no">623</span><span id="line-623"></span>
+<span class="source-line-no">624</span><span id="line-624"> HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, KVScannerComparator comparator)</span>
+<span class="source-line-no">625</span><span id="line-625"> throws IOException {</span>
+<span class="source-line-no">626</span><span id="line-626"> super(scanners, comparator);</span>
+<span class="source-line-no">627</span><span id="line-627"> }</span>
+<span class="source-line-no">628</span><span id="line-628"></span>
+<span class="source-line-no">629</span><span id="line-629"> @Override</span>
+<span class="source-line-no">630</span><span id="line-630"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
<span class="source-line-no">631</span><span id="line-631"> throws IOException {</span>
-<span class="source-line-no">632</span><span id="line-632"> super(scanners, comparator);</span>
-<span class="source-line-no">633</span><span id="line-633"> }</span>
-<span class="source-line-no">634</span><span id="line-634"></span>
-<span class="source-line-no">635</span><span id="line-635"> @Override</span>
-<span class="source-line-no">636</span><span id="line-636"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
-<span class="source-line-no">637</span><span id="line-637"> throws IOException {</span>
-<span class="source-line-no">638</span><span id="line-638"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">639</span><span id="line-639"> boolean moreRows = super.next(result, context);</span>
-<span class="source-line-no">640</span><span id="line-640"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">641</span><span id="line-641"> return moreRows;</span>
-<span class="source-line-no">642</span><span id="line-642"> }</span>
-<span class="source-line-no">643</span><span id="line-643"> }</span>
-<span class="source-line-no">644</span><span id="line-644"></span>
-<span class="source-line-no">645</span><span id="line-645"> /**</span>
-<span class="source-line-no">646</span><span id="line-646"> * Custom reversed KV Heap that can be configured to sleep in between retrievals of column family</span>
-<span class="source-line-no">647</span><span id="line-647"> * cells.</span>
-<span class="source-line-no">648</span><span id="line-648"> */</span>
-<span class="source-line-no">649</span><span id="line-649"> private static final class HeartbeatReversedKVHeap extends ReversedKeyValueHeap {</span>
-<span class="source-line-no">650</span><span id="line-650"> public HeartbeatReversedKVHeap(List<? extends KeyValueScanner> scanners,</span>
-<span class="source-line-no">651</span><span id="line-651"> CellComparatorImpl comparator) throws IOException {</span>
-<span class="source-line-no">652</span><span id="line-652"> super(scanners, comparator);</span>
-<span class="source-line-no">653</span><span id="line-653"> }</span>
-<span class="source-line-no">654</span><span id="line-654"></span>
-<span class="source-line-no">655</span><span id="line-655"> @Override</span>
-<span class="source-line-no">656</span><span id="line-656"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
-<span class="source-line-no">657</span><span id="line-657"> throws IOException {</span>
-<span class="source-line-no">658</span><span id="line-658"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">659</span><span id="line-659"> boolean moreRows = super.next(result, context);</span>
-<span class="source-line-no">660</span><span id="line-660"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">661</span><span id="line-661"> return moreRows;</span>
-<span class="source-line-no">662</span><span id="line-662"> }</span>
-<span class="source-line-no">663</span><span id="line-663"> }</span>
-<span class="source-line-no">664</span><span id="line-664">}</span>
+<span class="source-line-no">632</span><span id="line-632"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">633</span><span id="line-633"> boolean moreRows = super.next(result, context);</span>
+<span class="source-line-no">634</span><span id="line-634"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">635</span><span id="line-635"> return moreRows;</span>
+<span class="source-line-no">636</span><span id="line-636"> }</span>
+<span class="source-line-no">637</span><span id="line-637"> }</span>
+<span class="source-line-no">638</span><span id="line-638"></span>
+<span class="source-line-no">639</span><span id="line-639"> /**</span>
+<span class="source-line-no">640</span><span id="line-640"> * Custom reversed KV Heap that can be configured to sleep in between retrievals of column family</span>
+<span class="source-line-no">641</span><span id="line-641"> * cells.</span>
+<span class="source-line-no">642</span><span id="line-642"> */</span>
+<span class="source-line-no">643</span><span id="line-643"> private static final class HeartbeatReversedKVHeap extends ReversedKeyValueHeap {</span>
+<span class="source-line-no">644</span><span id="line-644"> public HeartbeatReversedKVHeap(List<? extends KeyValueScanner> scanners,</span>
+<span class="source-line-no">645</span><span id="line-645"> CellComparatorImpl comparator) throws IOException {</span>
+<span class="source-line-no">646</span><span id="line-646"> super(scanners, comparator);</span>
+<span class="source-line-no">647</span><span id="line-647"> }</span>
+<span class="source-line-no">648</span><span id="line-648"></span>
+<span class="source-line-no">649</span><span id="line-649"> @Override</span>
+<span class="source-line-no">650</span><span id="line-650"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
+<span class="source-line-no">651</span><span id="line-651"> throws IOException {</span>
+<span class="source-line-no">652</span><span id="line-652"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">653</span><span id="line-653"> boolean moreRows = super.next(result, context);</span>
+<span class="source-line-no">654</span><span id="line-654"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">655</span><span id="line-655"> return moreRows;</span>
+<span class="source-line-no">656</span><span id="line-656"> }</span>
+<span class="source-line-no">657</span><span id="line-657"> }</span>
+<span class="source-line-no">658</span><span id="line-658">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseRowFilter.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseRowFilter.html
index 9dd20629b36..6afaa041bb2 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseRowFilter.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.SparseRowFilter.html
@@ -31,9 +31,9 @@
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
<span class="source-line-no">020</span><span id="line-20">import static org.apache.hadoop.hbase.regionserver.RSRpcServices.DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">022</span><span id="line-22">import static org.junit.Assert.assertTrue;</span>
-<span class="source-line-no">023</span><span id="line-23">import static org.junit.Assert.fail;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">022</span><span id="line-22">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
+<span class="source-line-no">023</span><span id="line-23">import static org.junit.jupiter.api.Assertions.fail;</span>
<span class="source-line-no">024</span><span id="line-24">import static org.mockito.Mockito.when;</span>
<span class="source-line-no">025</span><span id="line-25"></span>
<span class="source-line-no">026</span><span id="line-26">import java.io.IOException;</span>
@@ -49,632 +49,626 @@
<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.CellComparatorImpl;</span>
<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.CellUtil;</span>
<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.ExtendedCell;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.HTestConst;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.KeyValue;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.AsyncConnection;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.AsyncTable;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.RegionInfo;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.client.ScanPerNextResultScanner;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
-<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.filter.Filter;</span>
-<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.filter.FilterBase;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.ipc.HBaseRpcController;</span>
-<span class="source-line-no">060</span><span id="line-60">import org.apache.hadoop.hbase.ipc.RpcCall;</span>
-<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
-<span class="source-line-no">062</span><span id="line-62">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">063</span><span id="line-63">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
-<span class="source-line-no">064</span><span id="line-64">import org.apache.hadoop.hbase.util.Threads;</span>
-<span class="source-line-no">065</span><span id="line-65">import org.apache.hadoop.hbase.wal.WAL;</span>
-<span class="source-line-no">066</span><span id="line-66">import org.junit.After;</span>
-<span class="source-line-no">067</span><span id="line-67">import org.junit.AfterClass;</span>
-<span class="source-line-no">068</span><span id="line-68">import org.junit.Before;</span>
-<span class="source-line-no">069</span><span id="line-69">import org.junit.BeforeClass;</span>
-<span class="source-line-no">070</span><span id="line-70">import org.junit.ClassRule;</span>
-<span class="source-line-no">071</span><span id="line-71">import org.junit.Test;</span>
-<span class="source-line-no">072</span><span id="line-72">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">073</span><span id="line-73">import org.mockito.Mockito;</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">import org.apache.hbase.thirdparty.com.google.common.io.Closeables;</span>
-<span class="source-line-no">076</span><span id="line-76">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
-<span class="source-line-no">077</span><span id="line-77">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
-<span class="source-line-no">078</span><span id="line-78"></span>
-<span class="source-line-no">079</span><span id="line-79">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;</span>
-<span class="source-line-no">080</span><span id="line-80">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82">/**</span>
-<span class="source-line-no">083</span><span id="line-83"> * Here we test to make sure that scans return the expected Results when the server is sending the</span>
-<span class="source-line-no">084</span><span id="line-84"> * Client heartbeat messages. Heartbeat messages are essentially keep-alive messages (they prevent</span>
-<span class="source-line-no">085</span><span id="line-85"> * the scanner on the client side from timing out). A heartbeat message is sent from the server to</span>
-<span class="source-line-no">086</span><span id="line-86"> * the client when the server has exceeded the time limit during the processing of the scan. When</span>
-<span class="source-line-no">087</span><span id="line-87"> * the time limit is reached, the server will return to the Client whatever Results it has</span>
-<span class="source-line-no">088</span><span id="line-88"> * accumulated (potentially empty).</span>
-<span class="source-line-no">089</span><span id="line-89"> */</span>
-<span class="source-line-no">090</span><span id="line-90">@Category(LargeTests.class)</span>
-<span class="source-line-no">091</span><span id="line-91">public class TestScannerHeartbeatMessages {</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.HTestConst;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.KeyValue;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.AsyncConnection;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.AsyncTable;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.RegionInfo;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.client.ScanPerNextResultScanner;</span>
+<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
+<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.filter.Filter;</span>
+<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.filter.FilterBase;</span>
+<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.ipc.HBaseRpcController;</span>
+<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.ipc.RpcCall;</span>
+<span class="source-line-no">060</span><span id="line-60">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
+<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">062</span><span id="line-62">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
+<span class="source-line-no">063</span><span id="line-63">import org.apache.hadoop.hbase.util.Threads;</span>
+<span class="source-line-no">064</span><span id="line-64">import org.apache.hadoop.hbase.wal.WAL;</span>
+<span class="source-line-no">065</span><span id="line-65">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">066</span><span id="line-66">import org.junit.jupiter.api.AfterEach;</span>
+<span class="source-line-no">067</span><span id="line-67">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">068</span><span id="line-68">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">069</span><span id="line-69">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">070</span><span id="line-70">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">071</span><span id="line-71">import org.mockito.Mockito;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">import org.apache.hbase.thirdparty.com.google.common.io.Closeables;</span>
+<span class="source-line-no">074</span><span id="line-74">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
+<span class="source-line-no">075</span><span id="line-75">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;</span>
+<span class="source-line-no">078</span><span id="line-78">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;</span>
+<span class="source-line-no">079</span><span id="line-79"></span>
+<span class="source-line-no">080</span><span id="line-80">/**</span>
+<span class="source-line-no">081</span><span id="line-81"> * Here we test to make sure that scans return the expected Results when the server is sending the</span>
+<span class="source-line-no">082</span><span id="line-82"> * Client heartbeat messages. Heartbeat messages are essentially keep-alive messages (they prevent</span>
+<span class="source-line-no">083</span><span id="line-83"> * the scanner on the client side from timing out). A heartbeat message is sent from the server to</span>
+<span class="source-line-no">084</span><span id="line-84"> * the client when the server has exceeded the time limit during the processing of the scan. When</span>
+<span class="source-line-no">085</span><span id="line-85"> * the time limit is reached, the server will return to the Client whatever Results it has</span>
+<span class="source-line-no">086</span><span id="line-86"> * accumulated (potentially empty).</span>
+<span class="source-line-no">087</span><span id="line-87"> */</span>
+<span class="source-line-no">088</span><span id="line-88">@Tag(LargeTests.TAG)</span>
+<span class="source-line-no">089</span><span id="line-89">public class TestScannerHeartbeatMessages {</span>
+<span class="source-line-no">090</span><span id="line-90"></span>
+<span class="source-line-no">091</span><span id="line-91"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93"> @ClassRule</span>
-<span class="source-line-no">094</span><span id="line-94"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">095</span><span id="line-95"> HBaseClassTestRule.forClass(TestScannerHeartbeatMessages.class);</span>
-<span class="source-line-no">096</span><span id="line-96"></span>
-<span class="source-line-no">097</span><span id="line-97"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99"> private static AsyncConnection CONN;</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101"> /**</span>
-<span class="source-line-no">102</span><span id="line-102"> * Table configuration</span>
-<span class="source-line-no">103</span><span id="line-103"> */</span>
-<span class="source-line-no">104</span><span id="line-104"> private static TableName TABLE_NAME = TableName.valueOf("testScannerHeartbeatMessagesTable");</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106"> private static int NUM_ROWS = 5;</span>
-<span class="source-line-no">107</span><span id="line-107"> private static byte[] ROW = Bytes.toBytes("testRow");</span>
-<span class="source-line-no">108</span><span id="line-108"> private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);</span>
-<span class="source-line-no">109</span><span id="line-109"></span>
-<span class="source-line-no">110</span><span id="line-110"> private static int NUM_FAMILIES = 4;</span>
-<span class="source-line-no">111</span><span id="line-111"> private static byte[] FAMILY = Bytes.toBytes("testFamily");</span>
-<span class="source-line-no">112</span><span id="line-112"> private static byte[][] FAMILIES = HTestConst.makeNAscii(FAMILY, NUM_FAMILIES);</span>
-<span class="source-line-no">113</span><span id="line-113"></span>
-<span class="source-line-no">114</span><span id="line-114"> private static int NUM_QUALIFIERS = 3;</span>
-<span class="source-line-no">115</span><span id="line-115"> private static byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
-<span class="source-line-no">116</span><span id="line-116"> private static byte[][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, NUM_QUALIFIERS);</span>
-<span class="source-line-no">117</span><span id="line-117"></span>
-<span class="source-line-no">118</span><span id="line-118"> private static int VALUE_SIZE = 128;</span>
-<span class="source-line-no">119</span><span id="line-119"> private static byte[] VALUE = Bytes.createMaxByteArray(VALUE_SIZE);</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121"> // The time limit should be based on the rpc timeout at client, or the client will regards</span>
-<span class="source-line-no">122</span><span id="line-122"> // the request as timeout before server return a heartbeat.</span>
-<span class="source-line-no">123</span><span id="line-123"> private static int SERVER_TIMEOUT = 60000;</span>
-<span class="source-line-no">124</span><span id="line-124"></span>
-<span class="source-line-no">125</span><span id="line-125"> // Time, in milliseconds, that the client will wait for a response from the server before timing</span>
-<span class="source-line-no">126</span><span id="line-126"> // out. This value is used server side to determine when it is necessary to send a heartbeat</span>
-<span class="source-line-no">127</span><span id="line-127"> // message to the client. Time limit will be 500 ms.</span>
-<span class="source-line-no">128</span><span id="line-128"> private static int CLIENT_TIMEOUT = 1000;</span>
-<span class="source-line-no">129</span><span id="line-129"></span>
-<span class="source-line-no">130</span><span id="line-130"> // In this test, we sleep after reading each row. So we should make sure after we get some number</span>
-<span class="source-line-no">131</span><span id="line-131"> // of rows and sleep same times we must reach time limit, and do not timeout after next sleeping.</span>
-<span class="source-line-no">132</span><span id="line-132"> private static int DEFAULT_ROW_SLEEP_TIME = 300;</span>
-<span class="source-line-no">133</span><span id="line-133"></span>
-<span class="source-line-no">134</span><span id="line-134"> // Similar with row sleep time.</span>
-<span class="source-line-no">135</span><span id="line-135"> private static int DEFAULT_CF_SLEEP_TIME = 300;</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137"> @BeforeClass</span>
-<span class="source-line-no">138</span><span id="line-138"> public static void setUpBeforeClass() throws Exception {</span>
-<span class="source-line-no">139</span><span id="line-139"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">093</span><span id="line-93"> private static AsyncConnection CONN;</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95"> /**</span>
+<span class="source-line-no">096</span><span id="line-96"> * Table configuration</span>
+<span class="source-line-no">097</span><span id="line-97"> */</span>
+<span class="source-line-no">098</span><span id="line-98"> private static TableName TABLE_NAME = TableName.valueOf("testScannerHeartbeatMessagesTable");</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100"> private static int NUM_ROWS = 5;</span>
+<span class="source-line-no">101</span><span id="line-101"> private static byte[] ROW = Bytes.toBytes("testRow");</span>
+<span class="source-line-no">102</span><span id="line-102"> private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104"> private static int NUM_FAMILIES = 4;</span>
+<span class="source-line-no">105</span><span id="line-105"> private static byte[] FAMILY = Bytes.toBytes("testFamily");</span>
+<span class="source-line-no">106</span><span id="line-106"> private static byte[][] FAMILIES = HTestConst.makeNAscii(FAMILY, NUM_FAMILIES);</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108"> private static int NUM_QUALIFIERS = 3;</span>
+<span class="source-line-no">109</span><span id="line-109"> private static byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
+<span class="source-line-no">110</span><span id="line-110"> private static byte[][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, NUM_QUALIFIERS);</span>
+<span class="source-line-no">111</span><span id="line-111"></span>
+<span class="source-line-no">112</span><span id="line-112"> private static int VALUE_SIZE = 128;</span>
+<span class="source-line-no">113</span><span id="line-113"> private static byte[] VALUE = Bytes.createMaxByteArray(VALUE_SIZE);</span>
+<span class="source-line-no">114</span><span id="line-114"></span>
+<span class="source-line-no">115</span><span id="line-115"> // The time limit should be based on the rpc timeout at client, or the client will regards</span>
+<span class="source-line-no">116</span><span id="line-116"> // the request as timeout before server return a heartbeat.</span>
+<span class="source-line-no">117</span><span id="line-117"> private static int SERVER_TIMEOUT = 60000;</span>
+<span class="source-line-no">118</span><span id="line-118"></span>
+<span class="source-line-no">119</span><span id="line-119"> // Time, in milliseconds, that the client will wait for a response from the server before timing</span>
+<span class="source-line-no">120</span><span id="line-120"> // out. This value is used server side to determine when it is necessary to send a heartbeat</span>
+<span class="source-line-no">121</span><span id="line-121"> // message to the client. Time limit will be 500 ms.</span>
+<span class="source-line-no">122</span><span id="line-122"> private static int CLIENT_TIMEOUT = 1000;</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124"> // In this test, we sleep after reading each row. So we should make sure after we get some number</span>
+<span class="source-line-no">125</span><span id="line-125"> // of rows and sleep same times we must reach time limit, and do not timeout after next sleeping.</span>
+<span class="source-line-no">126</span><span id="line-126"> private static int DEFAULT_ROW_SLEEP_TIME = 300;</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128"> // Similar with row sleep time.</span>
+<span class="source-line-no">129</span><span id="line-129"> private static int DEFAULT_CF_SLEEP_TIME = 300;</span>
+<span class="source-line-no">130</span><span id="line-130"></span>
+<span class="source-line-no">131</span><span id="line-131"> @BeforeAll</span>
+<span class="source-line-no">132</span><span id="line-132"> public static void setUpBeforeClass() throws Exception {</span>
+<span class="source-line-no">133</span><span id="line-133"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">134</span><span id="line-134"></span>
+<span class="source-line-no">135</span><span id="line-135"> conf.setStrings(HConstants.REGION_IMPL, HeartbeatHRegion.class.getName());</span>
+<span class="source-line-no">136</span><span id="line-136"> conf.setStrings(HConstants.REGION_SERVER_IMPL, HeartbeatHRegionServer.class.getName());</span>
+<span class="source-line-no">137</span><span id="line-137"> conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SERVER_TIMEOUT);</span>
+<span class="source-line-no">138</span><span id="line-138"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, SERVER_TIMEOUT);</span>
+<span class="source-line-no">139</span><span id="line-139"> conf.setInt(HConstants.HBASE_CLIENT_PAUSE, 1);</span>
<span class="source-line-no">140</span><span id="line-140"></span>
-<span class="source-line-no">141</span><span id="line-141"> conf.setStrings(HConstants.REGION_IMPL, HeartbeatHRegion.class.getName());</span>
-<span class="source-line-no">142</span><span id="line-142"> conf.setStrings(HConstants.REGION_SERVER_IMPL, HeartbeatHRegionServer.class.getName());</span>
-<span class="source-line-no">143</span><span id="line-143"> conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SERVER_TIMEOUT);</span>
-<span class="source-line-no">144</span><span id="line-144"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, SERVER_TIMEOUT);</span>
-<span class="source-line-no">145</span><span id="line-145"> conf.setInt(HConstants.HBASE_CLIENT_PAUSE, 1);</span>
+<span class="source-line-no">141</span><span id="line-141"> // Check the timeout condition after every cell</span>
+<span class="source-line-no">142</span><span id="line-142"> conf.setLong(StoreScanner.HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK, 1);</span>
+<span class="source-line-no">143</span><span id="line-143"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145"> createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);</span>
<span class="source-line-no">146</span><span id="line-146"></span>
-<span class="source-line-no">147</span><span id="line-147"> // Check the timeout condition after every cell</span>
-<span class="source-line-no">148</span><span id="line-148"> conf.setLong(StoreScanner.HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK, 1);</span>
-<span class="source-line-no">149</span><span id="line-149"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">150</span><span id="line-150"></span>
-<span class="source-line-no">151</span><span id="line-151"> createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);</span>
+<span class="source-line-no">147</span><span id="line-147"> Configuration newConf = new Configuration(conf);</span>
+<span class="source-line-no">148</span><span id="line-148"> newConf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, CLIENT_TIMEOUT);</span>
+<span class="source-line-no">149</span><span id="line-149"> newConf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, CLIENT_TIMEOUT);</span>
+<span class="source-line-no">150</span><span id="line-150"> CONN = ConnectionFactory.createAsyncConnection(newConf).get();</span>
+<span class="source-line-no">151</span><span id="line-151"> }</span>
<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> Configuration newConf = new Configuration(conf);</span>
-<span class="source-line-no">154</span><span id="line-154"> newConf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, CLIENT_TIMEOUT);</span>
-<span class="source-line-no">155</span><span id="line-155"> newConf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, CLIENT_TIMEOUT);</span>
-<span class="source-line-no">156</span><span id="line-156"> CONN = ConnectionFactory.createAsyncConnection(newConf).get();</span>
-<span class="source-line-no">157</span><span id="line-157"> }</span>
-<span class="source-line-no">158</span><span id="line-158"></span>
-<span class="source-line-no">159</span><span id="line-159"> @Test</span>
-<span class="source-line-no">160</span><span id="line-160"> public void testTimeLimitAccountsForQueueTime() throws IOException, InterruptedException {</span>
-<span class="source-line-no">161</span><span id="line-161"> HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
-<span class="source-line-no">162</span><span id="line-162"> RSRpcServices services = new RSRpcServices(rs);</span>
-<span class="source-line-no">163</span><span id="line-163"> RpcCall mockRpcCall = Mockito.mock(RpcCall.class);</span>
-<span class="source-line-no">164</span><span id="line-164"> // first return 180 (minimal queuing), then 120 (more queueing), then 101 (heavy queueing)</span>
-<span class="source-line-no">165</span><span id="line-165"> // finally, 25 is fatal levels of queueing -- exceeding timeout</span>
-<span class="source-line-no">166</span><span id="line-166"> when(mockRpcCall.getReceiveTime()).thenReturn(180L, 120L, 101L, 25L);</span>
-<span class="source-line-no">167</span><span id="line-167"></span>
-<span class="source-line-no">168</span><span id="line-168"> // assume timeout of 100ms</span>
-<span class="source-line-no">169</span><span id="line-169"> HBaseRpcController mockController = Mockito.mock(HBaseRpcController.class);</span>
-<span class="source-line-no">170</span><span id="line-170"> when(mockController.getCallTimeout()).thenReturn(100);</span>
-<span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172"> // current time is 100, which we'll subtract from 90 and 50 to generate some time deltas</span>
-<span class="source-line-no">173</span><span id="line-173"> EnvironmentEdgeManager.injectEdge(() -> 200L);</span>
-<span class="source-line-no">174</span><span id="line-174"></span>
-<span class="source-line-no">175</span><span id="line-175"> try {</span>
-<span class="source-line-no">176</span><span id="line-176"> // we queued for 20ms, leaving 80ms of timeout, which we divide by 2</span>
-<span class="source-line-no">177</span><span id="line-177"> assertEquals(200 + (100 - 20) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">178</span><span id="line-178"> // we queued for 80ms, leaving 20ms of timeout, which we divide by 2</span>
-<span class="source-line-no">179</span><span id="line-179"> assertEquals(200 + (100 - 80) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">180</span><span id="line-180"> // we queued for 99ms of 100ms timeout, leaving only 1ms. we fall back to default minimum</span>
-<span class="source-line-no">181</span><span id="line-181"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
-<span class="source-line-no">182</span><span id="line-182"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">183</span><span id="line-183"> // lastly, we queue for 175ms of 100ms timeout. this should be very rare since we drop</span>
-<span class="source-line-no">184</span><span id="line-184"> // timed out calls in the queue. in this case we still fallback on default minimum for now.</span>
-<span class="source-line-no">185</span><span id="line-185"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
-<span class="source-line-no">186</span><span id="line-186"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">187</span><span id="line-187"> } finally {</span>
-<span class="source-line-no">188</span><span id="line-188"> EnvironmentEdgeManager.reset();</span>
-<span class="source-line-no">189</span><span id="line-189"> }</span>
-<span class="source-line-no">190</span><span id="line-190"></span>
-<span class="source-line-no">191</span><span id="line-191"> }</span>
-<span class="source-line-no">192</span><span id="line-192"></span>
-<span class="source-line-no">193</span><span id="line-193"> static void createTestTable(TableName name, byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
-<span class="source-line-no">194</span><span id="line-194"> byte[] cellValue) throws IOException {</span>
-<span class="source-line-no">195</span><span id="line-195"> Table ht = TEST_UTIL.createTable(name, families);</span>
-<span class="source-line-no">196</span><span id="line-196"> List<Put> puts = createPuts(rows, families, qualifiers, cellValue);</span>
-<span class="source-line-no">197</span><span id="line-197"> ht.put(puts);</span>
-<span class="source-line-no">198</span><span id="line-198"> }</span>
-<span class="source-line-no">199</span><span id="line-199"></span>
-<span class="source-line-no">200</span><span id="line-200"> /**</span>
-<span class="source-line-no">201</span><span id="line-201"> * Make puts to put the input value into each combination of row, family, and qualifier</span>
-<span class="source-line-no">202</span><span id="line-202"> */</span>
-<span class="source-line-no">203</span><span id="line-203"> static ArrayList<Put> createPuts(byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
-<span class="source-line-no">204</span><span id="line-204"> byte[] value) throws IOException {</span>
-<span class="source-line-no">205</span><span id="line-205"> Put put;</span>
-<span class="source-line-no">206</span><span id="line-206"> ArrayList<Put> puts = new ArrayList<>();</span>
-<span class="source-line-no">207</span><span id="line-207"></span>
-<span class="source-line-no">208</span><span id="line-208"> for (int row = 0; row < rows.length; row++) {</span>
-<span class="source-line-no">209</span><span id="line-209"> put = new Put(rows[row]);</span>
-<span class="source-line-no">210</span><span id="line-210"> for (int fam = 0; fam < families.length; fam++) {</span>
-<span class="source-line-no">211</span><span id="line-211"> for (int qual = 0; qual < qualifiers.length; qual++) {</span>
-<span class="source-line-no">212</span><span id="line-212"> KeyValue kv = new KeyValue(rows[row], families[fam], qualifiers[qual], qual, value);</span>
-<span class="source-line-no">213</span><span id="line-213"> put.add(kv);</span>
-<span class="source-line-no">214</span><span id="line-214"> }</span>
-<span class="source-line-no">215</span><span id="line-215"> }</span>
-<span class="source-line-no">216</span><span id="line-216"> puts.add(put);</span>
-<span class="source-line-no">217</span><span id="line-217"> }</span>
-<span class="source-line-no">218</span><span id="line-218"></span>
-<span class="source-line-no">219</span><span id="line-219"> return puts;</span>
+<span class="source-line-no">153</span><span id="line-153"> @Test</span>
+<span class="source-line-no">154</span><span id="line-154"> public void testTimeLimitAccountsForQueueTime() throws IOException, InterruptedException {</span>
+<span class="source-line-no">155</span><span id="line-155"> HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
+<span class="source-line-no">156</span><span id="line-156"> RSRpcServices services = new RSRpcServices(rs);</span>
+<span class="source-line-no">157</span><span id="line-157"> RpcCall mockRpcCall = Mockito.mock(RpcCall.class);</span>
+<span class="source-line-no">158</span><span id="line-158"> // first return 180 (minimal queuing), then 120 (more queueing), then 101 (heavy queueing)</span>
+<span class="source-line-no">159</span><span id="line-159"> // finally, 25 is fatal levels of queueing -- exceeding timeout</span>
+<span class="source-line-no">160</span><span id="line-160"> when(mockRpcCall.getReceiveTime()).thenReturn(180L, 120L, 101L, 25L);</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162"> // assume timeout of 100ms</span>
+<span class="source-line-no">163</span><span id="line-163"> HBaseRpcController mockController = Mockito.mock(HBaseRpcController.class);</span>
+<span class="source-line-no">164</span><span id="line-164"> when(mockController.getCallTimeout()).thenReturn(100);</span>
+<span class="source-line-no">165</span><span id="line-165"></span>
+<span class="source-line-no">166</span><span id="line-166"> // current time is 100, which we'll subtract from 90 and 50 to generate some time deltas</span>
+<span class="source-line-no">167</span><span id="line-167"> EnvironmentEdgeManager.injectEdge(() -> 200L);</span>
+<span class="source-line-no">168</span><span id="line-168"></span>
+<span class="source-line-no">169</span><span id="line-169"> try {</span>
+<span class="source-line-no">170</span><span id="line-170"> // we queued for 20ms, leaving 80ms of timeout, which we divide by 2</span>
+<span class="source-line-no">171</span><span id="line-171"> assertEquals(200 + (100 - 20) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">172</span><span id="line-172"> // we queued for 80ms, leaving 20ms of timeout, which we divide by 2</span>
+<span class="source-line-no">173</span><span id="line-173"> assertEquals(200 + (100 - 80) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">174</span><span id="line-174"> // we queued for 99ms of 100ms timeout, leaving only 1ms. we fall back to default minimum</span>
+<span class="source-line-no">175</span><span id="line-175"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
+<span class="source-line-no">176</span><span id="line-176"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">177</span><span id="line-177"> // lastly, we queue for 175ms of 100ms timeout. this should be very rare since we drop</span>
+<span class="source-line-no">178</span><span id="line-178"> // timed out calls in the queue. in this case we still fallback on default minimum for now.</span>
+<span class="source-line-no">179</span><span id="line-179"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
+<span class="source-line-no">180</span><span id="line-180"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">181</span><span id="line-181"> } finally {</span>
+<span class="source-line-no">182</span><span id="line-182"> EnvironmentEdgeManager.reset();</span>
+<span class="source-line-no">183</span><span id="line-183"> }</span>
+<span class="source-line-no">184</span><span id="line-184"></span>
+<span class="source-line-no">185</span><span id="line-185"> }</span>
+<span class="source-line-no">186</span><span id="line-186"></span>
+<span class="source-line-no">187</span><span id="line-187"> static void createTestTable(TableName name, byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
+<span class="source-line-no">188</span><span id="line-188"> byte[] cellValue) throws IOException {</span>
+<span class="source-line-no">189</span><span id="line-189"> Table ht = TEST_UTIL.createTable(name, families);</span>
+<span class="source-line-no">190</span><span id="line-190"> List<Put> puts = createPuts(rows, families, qualifiers, cellValue);</span>
+<span class="source-line-no">191</span><span id="line-191"> ht.put(puts);</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">193</span><span id="line-193"></span>
+<span class="source-line-no">194</span><span id="line-194"> /**</span>
+<span class="source-line-no">195</span><span id="line-195"> * Make puts to put the input value into each combination of row, family, and qualifier</span>
+<span class="source-line-no">196</span><span id="line-196"> */</span>
+<span class="source-line-no">197</span><span id="line-197"> static ArrayList<Put> createPuts(byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
+<span class="source-line-no">198</span><span id="line-198"> byte[] value) throws IOException {</span>
+<span class="source-line-no">199</span><span id="line-199"> Put put;</span>
+<span class="source-line-no">200</span><span id="line-200"> ArrayList<Put> puts = new ArrayList<>();</span>
+<span class="source-line-no">201</span><span id="line-201"></span>
+<span class="source-line-no">202</span><span id="line-202"> for (int row = 0; row < rows.length; row++) {</span>
+<span class="source-line-no">203</span><span id="line-203"> put = new Put(rows[row]);</span>
+<span class="source-line-no">204</span><span id="line-204"> for (int fam = 0; fam < families.length; fam++) {</span>
+<span class="source-line-no">205</span><span id="line-205"> for (int qual = 0; qual < qualifiers.length; qual++) {</span>
+<span class="source-line-no">206</span><span id="line-206"> KeyValue kv = new KeyValue(rows[row], families[fam], qualifiers[qual], qual, value);</span>
+<span class="source-line-no">207</span><span id="line-207"> put.add(kv);</span>
+<span class="source-line-no">208</span><span id="line-208"> }</span>
+<span class="source-line-no">209</span><span id="line-209"> }</span>
+<span class="source-line-no">210</span><span id="line-210"> puts.add(put);</span>
+<span class="source-line-no">211</span><span id="line-211"> }</span>
+<span class="source-line-no">212</span><span id="line-212"></span>
+<span class="source-line-no">213</span><span id="line-213"> return puts;</span>
+<span class="source-line-no">214</span><span id="line-214"> }</span>
+<span class="source-line-no">215</span><span id="line-215"></span>
+<span class="source-line-no">216</span><span id="line-216"> @AfterAll</span>
+<span class="source-line-no">217</span><span id="line-217"> public static void tearDownAfterClass() throws Exception {</span>
+<span class="source-line-no">218</span><span id="line-218"> Closeables.close(CONN, true);</span>
+<span class="source-line-no">219</span><span id="line-219"> TEST_UTIL.shutdownMiniCluster();</span>
<span class="source-line-no">220</span><span id="line-220"> }</span>
<span class="source-line-no">221</span><span id="line-221"></span>
-<span class="source-line-no">222</span><span id="line-222"> @AfterClass</span>
-<span class="source-line-no">223</span><span id="line-223"> public static void tearDownAfterClass() throws Exception {</span>
-<span class="source-line-no">224</span><span id="line-224"> Closeables.close(CONN, true);</span>
-<span class="source-line-no">225</span><span id="line-225"> TEST_UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">226</span><span id="line-226"> }</span>
-<span class="source-line-no">227</span><span id="line-227"></span>
-<span class="source-line-no">228</span><span id="line-228"> @Before</span>
-<span class="source-line-no">229</span><span id="line-229"> public void setupBeforeTest() throws Exception {</span>
-<span class="source-line-no">230</span><span id="line-230"> disableSleeping();</span>
-<span class="source-line-no">231</span><span id="line-231"> }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233"> @After</span>
-<span class="source-line-no">234</span><span id="line-234"> public void teardownAfterTest() throws Exception {</span>
-<span class="source-line-no">235</span><span id="line-235"> disableSleeping();</span>
-<span class="source-line-no">236</span><span id="line-236"> }</span>
-<span class="source-line-no">237</span><span id="line-237"></span>
-<span class="source-line-no">238</span><span id="line-238"> /**</span>
-<span class="source-line-no">239</span><span id="line-239"> * Run the test callable when heartbeats are enabled/disabled. We expect all tests to only pass</span>
-<span class="source-line-no">240</span><span id="line-240"> * when heartbeat messages are enabled (otherwise the test is pointless). When heartbeats are</span>
-<span class="source-line-no">241</span><span id="line-241"> * disabled, the test should throw an exception.</span>
-<span class="source-line-no">242</span><span id="line-242"> */</span>
-<span class="source-line-no">243</span><span id="line-243"> private void testImportanceOfHeartbeats(Callable<Void> testCallable) throws InterruptedException {</span>
-<span class="source-line-no">244</span><span id="line-244"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
-<span class="source-line-no">245</span><span id="line-245"></span>
-<span class="source-line-no">246</span><span id="line-246"> try {</span>
-<span class="source-line-no">247</span><span id="line-247"> testCallable.call();</span>
-<span class="source-line-no">248</span><span id="line-248"> } catch (Exception e) {</span>
-<span class="source-line-no">249</span><span id="line-249"> fail("Heartbeat messages are enabled, exceptions should NOT be thrown. Exception trace:"</span>
-<span class="source-line-no">250</span><span id="line-250"> + ExceptionUtils.getStackTrace(e));</span>
-<span class="source-line-no">251</span><span id="line-251"> }</span>
-<span class="source-line-no">252</span><span id="line-252"></span>
-<span class="source-line-no">253</span><span id="line-253"> HeartbeatRPCServices.heartbeatsEnabled = false;</span>
-<span class="source-line-no">254</span><span id="line-254"> try {</span>
-<span class="source-line-no">255</span><span id="line-255"> testCallable.call();</span>
-<span class="source-line-no">256</span><span id="line-256"> } catch (Exception e) {</span>
-<span class="source-line-no">257</span><span id="line-257"> return;</span>
-<span class="source-line-no">258</span><span id="line-258"> } finally {</span>
-<span class="source-line-no">259</span><span id="line-259"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
-<span class="source-line-no">260</span><span id="line-260"> }</span>
-<span class="source-line-no">261</span><span id="line-261"> fail("Heartbeats messages are disabled, an exception should be thrown. If an exception "</span>
-<span class="source-line-no">262</span><span id="line-262"> + " is not thrown, the test case is not testing the importance of heartbeat messages");</span>
-<span class="source-line-no">263</span><span id="line-263"> }</span>
-<span class="source-line-no">264</span><span id="line-264"></span>
-<span class="source-line-no">265</span><span id="line-265"> /**</span>
-<span class="source-line-no">266</span><span id="line-266"> * Test the case that the time limit for the scan is reached after each full row of cells is</span>
-<span class="source-line-no">267</span><span id="line-267"> * fetched.</span>
-<span class="source-line-no">268</span><span id="line-268"> */</span>
-<span class="source-line-no">269</span><span id="line-269"> @Test</span>
-<span class="source-line-no">270</span><span id="line-270"> public void testHeartbeatBetweenRows() throws Exception {</span>
-<span class="source-line-no">271</span><span id="line-271"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">272</span><span id="line-272"></span>
-<span class="source-line-no">273</span><span id="line-273"> @Override</span>
-<span class="source-line-no">274</span><span id="line-274"> public Void call() throws Exception {</span>
-<span class="source-line-no">275</span><span id="line-275"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
-<span class="source-line-no">276</span><span id="line-276"> // the case where a scan stops on the server side due to a time limit</span>
-<span class="source-line-no">277</span><span id="line-277"> Scan scan = new Scan();</span>
-<span class="source-line-no">278</span><span id="line-278"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">279</span><span id="line-279"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">222</span><span id="line-222"> @BeforeEach</span>
+<span class="source-line-no">223</span><span id="line-223"> public void setupBeforeTest() throws Exception {</span>
+<span class="source-line-no">224</span><span id="line-224"> disableSleeping();</span>
+<span class="source-line-no">225</span><span id="line-225"> }</span>
+<span class="source-line-no">226</span><span id="line-226"></span>
+<span class="source-line-no">227</span><span id="line-227"> @AfterEach</span>
+<span class="source-line-no">228</span><span id="line-228"> public void teardownAfterTest() throws Exception {</span>
+<span class="source-line-no">229</span><span id="line-229"> disableSleeping();</span>
+<span class="source-line-no">230</span><span id="line-230"> }</span>
+<span class="source-line-no">231</span><span id="line-231"></span>
+<span class="source-line-no">232</span><span id="line-232"> /**</span>
+<span class="source-line-no">233</span><span id="line-233"> * Run the test callable when heartbeats are enabled/disabled. We expect all tests to only pass</span>
+<span class="source-line-no">234</span><span id="line-234"> * when heartbeat messages are enabled (otherwise the test is pointless). When heartbeats are</span>
+<span class="source-line-no">235</span><span id="line-235"> * disabled, the test should throw an exception.</span>
+<span class="source-line-no">236</span><span id="line-236"> */</span>
+<span class="source-line-no">237</span><span id="line-237"> private void testImportanceOfHeartbeats(Callable<Void> testCallable) throws InterruptedException {</span>
+<span class="source-line-no">238</span><span id="line-238"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
+<span class="source-line-no">239</span><span id="line-239"></span>
+<span class="source-line-no">240</span><span id="line-240"> try {</span>
+<span class="source-line-no">241</span><span id="line-241"> testCallable.call();</span>
+<span class="source-line-no">242</span><span id="line-242"> } catch (Exception e) {</span>
+<span class="source-line-no">243</span><span id="line-243"> fail("Heartbeat messages are enabled, exceptions should NOT be thrown. Exception trace:"</span>
+<span class="source-line-no">244</span><span id="line-244"> + ExceptionUtils.getStackTrace(e));</span>
+<span class="source-line-no">245</span><span id="line-245"> }</span>
+<span class="source-line-no">246</span><span id="line-246"></span>
+<span class="source-line-no">247</span><span id="line-247"> HeartbeatRPCServices.heartbeatsEnabled = false;</span>
+<span class="source-line-no">248</span><span id="line-248"> try {</span>
+<span class="source-line-no">249</span><span id="line-249"> testCallable.call();</span>
+<span class="source-line-no">250</span><span id="line-250"> } catch (Exception e) {</span>
+<span class="source-line-no">251</span><span id="line-251"> return;</span>
+<span class="source-line-no">252</span><span id="line-252"> } finally {</span>
+<span class="source-line-no">253</span><span id="line-253"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
+<span class="source-line-no">254</span><span id="line-254"> }</span>
+<span class="source-line-no">255</span><span id="line-255"> fail("Heartbeats messages are disabled, an exception should be thrown. If an exception "</span>
+<span class="source-line-no">256</span><span id="line-256"> + " is not thrown, the test case is not testing the importance of heartbeat messages");</span>
+<span class="source-line-no">257</span><span id="line-257"> }</span>
+<span class="source-line-no">258</span><span id="line-258"></span>
+<span class="source-line-no">259</span><span id="line-259"> /**</span>
+<span class="source-line-no">260</span><span id="line-260"> * Test the case that the time limit for the scan is reached after each full row of cells is</span>
+<span class="source-line-no">261</span><span id="line-261"> * fetched.</span>
+<span class="source-line-no">262</span><span id="line-262"> */</span>
+<span class="source-line-no">263</span><span id="line-263"> @Test</span>
+<span class="source-line-no">264</span><span id="line-264"> public void testHeartbeatBetweenRows() throws Exception {</span>
+<span class="source-line-no">265</span><span id="line-265"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">266</span><span id="line-266"></span>
+<span class="source-line-no">267</span><span id="line-267"> @Override</span>
+<span class="source-line-no">268</span><span id="line-268"> public Void call() throws Exception {</span>
+<span class="source-line-no">269</span><span id="line-269"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
+<span class="source-line-no">270</span><span id="line-270"> // the case where a scan stops on the server side due to a time limit</span>
+<span class="source-line-no">271</span><span id="line-271"> Scan scan = new Scan();</span>
+<span class="source-line-no">272</span><span id="line-272"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">273</span><span id="line-273"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">274</span><span id="line-274"></span>
+<span class="source-line-no">275</span><span id="line-275"> testEquivalenceOfScanWithHeartbeats(scan, DEFAULT_ROW_SLEEP_TIME, -1, false);</span>
+<span class="source-line-no">276</span><span id="line-276"> return null;</span>
+<span class="source-line-no">277</span><span id="line-277"> }</span>
+<span class="source-line-no">278</span><span id="line-278"> });</span>
+<span class="source-line-no">279</span><span id="line-279"> }</span>
<span class="source-line-no">280</span><span id="line-280"></span>
-<span class="source-line-no">281</span><span id="line-281"> testEquivalenceOfScanWithHeartbeats(scan, DEFAULT_ROW_SLEEP_TIME, -1, false);</span>
-<span class="source-line-no">282</span><span id="line-282"> return null;</span>
-<span class="source-line-no">283</span><span id="line-283"> }</span>
-<span class="source-line-no">284</span><span id="line-284"> });</span>
-<span class="source-line-no">285</span><span id="line-285"> }</span>
-<span class="source-line-no">286</span><span id="line-286"></span>
-<span class="source-line-no">287</span><span id="line-287"> /**</span>
-<span class="source-line-no">288</span><span id="line-288"> * Test the case that the time limit for scans is reached in between column families</span>
-<span class="source-line-no">289</span><span id="line-289"> */</span>
-<span class="source-line-no">290</span><span id="line-290"> @Test</span>
-<span class="source-line-no">291</span><span id="line-291"> public void testHeartbeatBetweenColumnFamilies() throws Exception {</span>
-<span class="source-line-no">292</span><span id="line-292"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">293</span><span id="line-293"> @Override</span>
-<span class="source-line-no">294</span><span id="line-294"> public Void call() throws Exception {</span>
-<span class="source-line-no">295</span><span id="line-295"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
-<span class="source-line-no">296</span><span id="line-296"> // the case where a scan stops on the server side due to a time limit</span>
-<span class="source-line-no">297</span><span id="line-297"> Scan baseScan = new Scan();</span>
-<span class="source-line-no">298</span><span id="line-298"> baseScan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">299</span><span id="line-299"> baseScan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">300</span><span id="line-300"></span>
-<span class="source-line-no">301</span><span id="line-301"> // Copy the scan before each test. When a scan object is used by a scanner, some of its</span>
-<span class="source-line-no">302</span><span id="line-302"> // fields may be changed such as start row</span>
-<span class="source-line-no">303</span><span id="line-303"> Scan scanCopy = new Scan(baseScan);</span>
-<span class="source-line-no">304</span><span id="line-304"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, false);</span>
-<span class="source-line-no">305</span><span id="line-305"> scanCopy = new Scan(baseScan);</span>
-<span class="source-line-no">306</span><span id="line-306"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, true);</span>
-<span class="source-line-no">307</span><span id="line-307"> return null;</span>
-<span class="source-line-no">308</span><span id="line-308"> }</span>
-<span class="source-line-no">309</span><span id="line-309"> });</span>
-<span class="source-line-no">310</span><span id="line-310"> }</span>
-<span class="source-line-no">311</span><span id="line-311"></span>
-<span class="source-line-no">312</span><span id="line-312"> public static class SparseCellFilter extends FilterBase {</span>
-<span class="source-line-no">313</span><span id="line-313"></span>
-<span class="source-line-no">314</span><span id="line-314"> @Override</span>
-<span class="source-line-no">315</span><span id="line-315"> public ReturnCode filterCell(final Cell v) throws IOException {</span>
-<span class="source-line-no">316</span><span id="line-316"> try {</span>
-<span class="source-line-no">317</span><span id="line-317"> Thread.sleep(CLIENT_TIMEOUT / 2 + 100);</span>
-<span class="source-line-no">318</span><span id="line-318"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">319</span><span id="line-319"> Thread.currentThread().interrupt();</span>
-<span class="source-line-no">320</span><span id="line-320"> }</span>
-<span class="source-line-no">321</span><span id="line-321"> return Bytes.equals(CellUtil.cloneRow(v), ROWS[NUM_ROWS - 1])</span>
-<span class="source-line-no">322</span><span id="line-322"> ? ReturnCode.INCLUDE</span>
-<span class="source-line-no">323</span><span id="line-323"> : ReturnCode.SKIP;</span>
-<span class="source-line-no">324</span><span id="line-324"> }</span>
-<span class="source-line-no">325</span><span id="line-325"></span>
-<span class="source-line-no">326</span><span id="line-326"> public static Filter parseFrom(final byte[] pbBytes) {</span>
-<span class="source-line-no">327</span><span id="line-327"> return new SparseCellFilter();</span>
-<span class="source-line-no">328</span><span id="line-328"> }</span>
-<span class="source-line-no">329</span><span id="line-329"> }</span>
-<span class="source-line-no">330</span><span id="line-330"></span>
-<span class="source-line-no">331</span><span id="line-331"> public static class SparseRowFilter extends FilterBase {</span>
-<span class="source-line-no">332</span><span id="line-332"></span>
-<span class="source-line-no">333</span><span id="line-333"> @Override</span>
-<span class="source-line-no">334</span><span id="line-334"> public boolean filterRowKey(Cell cell) throws IOException {</span>
-<span class="source-line-no">335</span><span id="line-335"> try {</span>
-<span class="source-line-no">336</span><span id="line-336"> Thread.sleep(CLIENT_TIMEOUT / 2 - 100);</span>
-<span class="source-line-no">337</span><span id="line-337"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">338</span><span id="line-338"> Thread.currentThread().interrupt();</span>
-<span class="source-line-no">339</span><span id="line-339"> }</span>
-<span class="source-line-no">340</span><span id="line-340"> return !Bytes.equals(CellUtil.cloneRow(cell), ROWS[NUM_ROWS - 1]);</span>
-<span class="source-line-no">341</span><span id="line-341"> }</span>
-<span class="source-line-no">342</span><span id="line-342"></span>
-<span class="source-line-no">343</span><span id="line-343"> public static Filter parseFrom(final byte[] pbBytes) {</span>
-<span class="source-line-no">344</span><span id="line-344"> return new SparseRowFilter();</span>
-<span class="source-line-no">345</span><span id="line-345"> }</span>
-<span class="source-line-no">346</span><span id="line-346"> }</span>
-<span class="source-line-no">347</span><span id="line-347"></span>
-<span class="source-line-no">348</span><span id="line-348"> /**</span>
-<span class="source-line-no">349</span><span id="line-349"> * Test the case that there is a filter which filters most of cells</span>
-<span class="source-line-no">350</span><span id="line-350"> */</span>
-<span class="source-line-no">351</span><span id="line-351"> @Test</span>
-<span class="source-line-no">352</span><span id="line-352"> public void testHeartbeatWithSparseCellFilter() throws Exception {</span>
-<span class="source-line-no">353</span><span id="line-353"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">354</span><span id="line-354"> @Override</span>
-<span class="source-line-no">355</span><span id="line-355"> public Void call() throws Exception {</span>
-<span class="source-line-no">356</span><span id="line-356"> Scan scan = new Scan();</span>
-<span class="source-line-no">357</span><span id="line-357"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">358</span><span id="line-358"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">359</span><span id="line-359"> scan.setFilter(new SparseCellFilter());</span>
-<span class="source-line-no">360</span><span id="line-360"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">361</span><span id="line-361"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">362</span><span id="line-362"> int num = 0;</span>
-<span class="source-line-no">363</span><span id="line-363"> while (scanner.next() != null) {</span>
-<span class="source-line-no">364</span><span id="line-364"> num++;</span>
-<span class="source-line-no">365</span><span id="line-365"> }</span>
-<span class="source-line-no">366</span><span id="line-366"> assertEquals(1, num);</span>
-<span class="source-line-no">367</span><span id="line-367"> }</span>
-<span class="source-line-no">368</span><span id="line-368"></span>
-<span class="source-line-no">369</span><span id="line-369"> scan = new Scan();</span>
-<span class="source-line-no">370</span><span id="line-370"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">371</span><span id="line-371"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">372</span><span id="line-372"> scan.setFilter(new SparseCellFilter());</span>
-<span class="source-line-no">373</span><span id="line-373"> scan.setAllowPartialResults(true);</span>
-<span class="source-line-no">374</span><span id="line-374"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">375</span><span id="line-375"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">376</span><span id="line-376"> int num = 0;</span>
-<span class="source-line-no">377</span><span id="line-377"> while (scanner.next() != null) {</span>
-<span class="source-line-no">378</span><span id="line-378"> num++;</span>
-<span class="source-line-no">379</span><span id="line-379"> }</span>
-<span class="source-line-no">380</span><span id="line-380"> assertEquals(NUM_FAMILIES * NUM_QUALIFIERS, num);</span>
-<span class="source-line-no">381</span><span id="line-381"> }</span>
-<span class="source-line-no">382</span><span id="line-382"></span>
-<span class="source-line-no">383</span><span id="line-383"> return null;</span>
-<span class="source-line-no">384</span><span id="line-384"> }</span>
-<span class="source-line-no">385</span><span id="line-385"> });</span>
-<span class="source-line-no">386</span><span id="line-386"> }</span>
-<span class="source-line-no">387</span><span id="line-387"></span>
-<span class="source-line-no">388</span><span id="line-388"> /**</span>
-<span class="source-line-no">389</span><span id="line-389"> * Test the case that there is a filter which filters most of rows</span>
-<span class="source-line-no">390</span><span id="line-390"> */</span>
-<span class="source-line-no">391</span><span id="line-391"> @Test</span>
-<span class="source-line-no">392</span><span id="line-392"> public void testHeartbeatWithSparseRowFilter() throws Exception {</span>
-<span class="source-line-no">393</span><span id="line-393"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">394</span><span id="line-394"> @Override</span>
-<span class="source-line-no">395</span><span id="line-395"> public Void call() throws Exception {</span>
-<span class="source-line-no">396</span><span id="line-396"> Scan scan = new Scan();</span>
-<span class="source-line-no">397</span><span id="line-397"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">398</span><span id="line-398"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">399</span><span id="line-399"> scan.setFilter(new SparseRowFilter());</span>
-<span class="source-line-no">400</span><span id="line-400"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">401</span><span id="line-401"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">402</span><span id="line-402"> int num = 0;</span>
-<span class="source-line-no">403</span><span id="line-403"> while (scanner.next() != null) {</span>
-<span class="source-line-no">404</span><span id="line-404"> num++;</span>
-<span class="source-line-no">405</span><span id="line-405"> }</span>
-<span class="source-line-no">406</span><span id="line-406"> assertEquals(1, num);</span>
-<span class="source-line-no">407</span><span id="line-407"> }</span>
-<span class="source-line-no">408</span><span id="line-408"></span>
-<span class="source-line-no">409</span><span id="line-409"> return null;</span>
-<span class="source-line-no">410</span><span id="line-410"> }</span>
-<span class="source-line-no">411</span><span id="line-411"> });</span>
-<span class="source-line-no">412</span><span id="line-412"> }</span>
-<span class="source-line-no">413</span><span id="line-413"></span>
-<span class="source-line-no">414</span><span id="line-414"> /**</span>
-<span class="source-line-no">415</span><span id="line-415"> * Test the equivalence of a scan versus the same scan executed when heartbeat messages are</span>
-<span class="source-line-no">416</span><span id="line-416"> * necessary</span>
-<span class="source-line-no">417</span><span id="line-417"> * @param scan The scan configuration being tested</span>
-<span class="source-line-no">418</span><span id="line-418"> * @param rowSleepTime The time to sleep between fetches of row cells</span>
-<span class="source-line-no">419</span><span id="line-419"> * @param cfSleepTime The time to sleep between fetches of column family cells</span>
-<span class="source-line-no">420</span><span id="line-420"> * @param sleepBeforeCf set to true when column family sleeps should occur before the cells for</span>
-<span class="source-line-no">421</span><span id="line-421"> * that column family are fetched</span>
-<span class="source-line-no">422</span><span id="line-422"> */</span>
-<span class="source-line-no">423</span><span id="line-423"> private void testEquivalenceOfScanWithHeartbeats(final Scan scan, int rowSleepTime,</span>
-<span class="source-line-no">424</span><span id="line-424"> int cfSleepTime, boolean sleepBeforeCf) throws Exception {</span>
-<span class="source-line-no">425</span><span id="line-425"> disableSleeping();</span>
-<span class="source-line-no">426</span><span id="line-426"> AsyncTable<AdvancedScanResultConsumer> table = CONN.getTable(TABLE_NAME);</span>
-<span class="source-line-no">427</span><span id="line-427"> final ResultScanner scanner = new ScanPerNextResultScanner(table, scan);</span>
-<span class="source-line-no">428</span><span id="line-428"> final ResultScanner scannerWithHeartbeats = new ScanPerNextResultScanner(table, scan);</span>
-<span class="source-line-no">429</span><span id="line-429"></span>
-<span class="source-line-no">430</span><span id="line-430"> Result r1 = null;</span>
-<span class="source-line-no">431</span><span id="line-431"> Result r2 = null;</span>
+<span class="source-line-no">281</span><span id="line-281"> /**</span>
+<span class="source-line-no">282</span><span id="line-282"> * Test the case that the time limit for scans is reached in between column families</span>
+<span class="source-line-no">283</span><span id="line-283"> */</span>
+<span class="source-line-no">284</span><span id="line-284"> @Test</span>
+<span class="source-line-no">285</span><span id="line-285"> public void testHeartbeatBetweenColumnFamilies() throws Exception {</span>
+<span class="source-line-no">286</span><span id="line-286"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">287</span><span id="line-287"> @Override</span>
+<span class="source-line-no">288</span><span id="line-288"> public Void call() throws Exception {</span>
+<span class="source-line-no">289</span><span id="line-289"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
+<span class="source-line-no">290</span><span id="line-290"> // the case where a scan stops on the server side due to a time limit</span>
+<span class="source-line-no">291</span><span id="line-291"> Scan baseScan = new Scan();</span>
+<span class="source-line-no">292</span><span id="line-292"> baseScan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">293</span><span id="line-293"> baseScan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">294</span><span id="line-294"></span>
+<span class="source-line-no">295</span><span id="line-295"> // Copy the scan before each test. When a scan object is used by a scanner, some of its</span>
+<span class="source-line-no">296</span><span id="line-296"> // fields may be changed such as start row</span>
+<span class="source-line-no">297</span><span id="line-297"> Scan scanCopy = new Scan(baseScan);</span>
+<span class="source-line-no">298</span><span id="line-298"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, false);</span>
+<span class="source-line-no">299</span><span id="line-299"> scanCopy = new Scan(baseScan);</span>
+<span class="source-line-no">300</span><span id="line-300"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, true);</span>
+<span class="source-line-no">301</span><span id="line-301"> return null;</span>
+<span class="source-line-no">302</span><span id="line-302"> }</span>
+<span class="source-line-no">303</span><span id="line-303"> });</span>
+<span class="source-line-no">304</span><span id="line-304"> }</span>
+<span class="source-line-no">305</span><span id="line-305"></span>
+<span class="source-line-no">306</span><span id="line-306"> public static class SparseCellFilter extends FilterBase {</span>
+<span class="source-line-no">307</span><span id="line-307"></span>
+<span class="source-line-no">308</span><span id="line-308"> @Override</span>
+<span class="source-line-no">309</span><span id="line-309"> public ReturnCode filterCell(final Cell v) throws IOException {</span>
+<span class="source-line-no">310</span><span id="line-310"> try {</span>
+<span class="source-line-no">311</span><span id="line-311"> Thread.sleep(CLIENT_TIMEOUT / 2 + 100);</span>
+<span class="source-line-no">312</span><span id="line-312"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">313</span><span id="line-313"> Thread.currentThread().interrupt();</span>
+<span class="source-line-no">314</span><span id="line-314"> }</span>
+<span class="source-line-no">315</span><span id="line-315"> return Bytes.equals(CellUtil.cloneRow(v), ROWS[NUM_ROWS - 1])</span>
+<span class="source-line-no">316</span><span id="line-316"> ? ReturnCode.INCLUDE</span>
+<span class="source-line-no">317</span><span id="line-317"> : ReturnCode.SKIP;</span>
+<span class="source-line-no">318</span><span id="line-318"> }</span>
+<span class="source-line-no">319</span><span id="line-319"></span>
+<span class="source-line-no">320</span><span id="line-320"> public static Filter parseFrom(final byte[] pbBytes) {</span>
+<span class="source-line-no">321</span><span id="line-321"> return new SparseCellFilter();</span>
+<span class="source-line-no">322</span><span id="line-322"> }</span>
+<span class="source-line-no">323</span><span id="line-323"> }</span>
+<span class="source-line-no">324</span><span id="line-324"></span>
+<span class="source-line-no">325</span><span id="line-325"> public static class SparseRowFilter extends FilterBase {</span>
+<span class="source-line-no">326</span><span id="line-326"></span>
+<span class="source-line-no">327</span><span id="line-327"> @Override</span>
+<span class="source-line-no">328</span><span id="line-328"> public boolean filterRowKey(Cell cell) throws IOException {</span>
+<span class="source-line-no">329</span><span id="line-329"> try {</span>
+<span class="source-line-no">330</span><span id="line-330"> Thread.sleep(CLIENT_TIMEOUT / 2 - 100);</span>
+<span class="source-line-no">331</span><span id="line-331"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">332</span><span id="line-332"> Thread.currentThread().interrupt();</span>
+<span class="source-line-no">333</span><span id="line-333"> }</span>
+<span class="source-line-no">334</span><span id="line-334"> return !Bytes.equals(CellUtil.cloneRow(cell), ROWS[NUM_ROWS - 1]);</span>
+<span class="source-line-no">335</span><span id="line-335"> }</span>
+<span class="source-line-no">336</span><span id="line-336"></span>
+<span class="source-line-no">337</span><span id="line-337"> public static Filter parseFrom(final byte[] pbBytes) {</span>
+<span class="source-line-no">338</span><span id="line-338"> return new SparseRowFilter();</span>
+<span class="source-line-no">339</span><span id="line-339"> }</span>
+<span class="source-line-no">340</span><span id="line-340"> }</span>
+<span class="source-line-no">341</span><span id="line-341"></span>
+<span class="source-line-no">342</span><span id="line-342"> /**</span>
+<span class="source-line-no">343</span><span id="line-343"> * Test the case that there is a filter which filters most of cells</span>
+<span class="source-line-no">344</span><span id="line-344"> */</span>
+<span class="source-line-no">345</span><span id="line-345"> @Test</span>
+<span class="source-line-no">346</span><span id="line-346"> public void testHeartbeatWithSparseCellFilter() throws Exception {</span>
+<span class="source-line-no">347</span><span id="line-347"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">348</span><span id="line-348"> @Override</span>
+<span class="source-line-no">349</span><span id="line-349"> public Void call() throws Exception {</span>
+<span class="source-line-no">350</span><span id="line-350"> Scan scan = new Scan();</span>
+<span class="source-line-no">351</span><span id="line-351"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">352</span><span id="line-352"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">353</span><span id="line-353"> scan.setFilter(new SparseCellFilter());</span>
+<span class="source-line-no">354</span><span id="line-354"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">355</span><span id="line-355"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">356</span><span id="line-356"> int num = 0;</span>
+<span class="source-line-no">357</span><span id="line-357"> while (scanner.next() != null) {</span>
+<span class="source-line-no">358</span><span id="line-358"> num++;</span>
+<span class="source-line-no">359</span><span id="line-359"> }</span>
+<span class="source-line-no">360</span><span id="line-360"> assertEquals(1, num);</span>
+<span class="source-line-no">361</span><span id="line-361"> }</span>
+<span class="source-line-no">362</span><span id="line-362"></span>
+<span class="source-line-no">363</span><span id="line-363"> scan = new Scan();</span>
+<span class="source-line-no">364</span><span id="line-364"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">365</span><span id="line-365"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">366</span><span id="line-366"> scan.setFilter(new SparseCellFilter());</span>
+<span class="source-line-no">367</span><span id="line-367"> scan.setAllowPartialResults(true);</span>
+<span class="source-line-no">368</span><span id="line-368"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">369</span><span id="line-369"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">370</span><span id="line-370"> int num = 0;</span>
+<span class="source-line-no">371</span><span id="line-371"> while (scanner.next() != null) {</span>
+<span class="source-line-no">372</span><span id="line-372"> num++;</span>
+<span class="source-line-no">373</span><span id="line-373"> }</span>
+<span class="source-line-no">374</span><span id="line-374"> assertEquals(NUM_FAMILIES * NUM_QUALIFIERS, num);</span>
+<span class="source-line-no">375</span><span id="line-375"> }</span>
+<span class="source-line-no">376</span><span id="line-376"></span>
+<span class="source-line-no">377</span><span id="line-377"> return null;</span>
+<span class="source-line-no">378</span><span id="line-378"> }</span>
+<span class="source-line-no">379</span><span id="line-379"> });</span>
+<span class="source-line-no">380</span><span id="line-380"> }</span>
+<span class="source-line-no">381</span><span id="line-381"></span>
+<span class="source-line-no">382</span><span id="line-382"> /**</span>
+<span class="source-line-no">383</span><span id="line-383"> * Test the case that there is a filter which filters most of rows</span>
+<span class="source-line-no">384</span><span id="line-384"> */</span>
+<span class="source-line-no">385</span><span id="line-385"> @Test</span>
+<span class="source-line-no">386</span><span id="line-386"> public void testHeartbeatWithSparseRowFilter() throws Exception {</span>
+<span class="source-line-no">387</span><span id="line-387"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">388</span><span id="line-388"> @Override</span>
+<span class="source-line-no">389</span><span id="line-389"> public Void call() throws Exception {</span>
+<span class="source-line-no">390</span><span id="line-390"> Scan scan = new Scan();</span>
+<span class="source-line-no">391</span><span id="line-391"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">392</span><span id="line-392"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">393</span><span id="line-393"> scan.setFilter(new SparseRowFilter());</span>
+<span class="source-line-no">394</span><span id="line-394"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">395</span><span id="line-395"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">396</span><span id="line-396"> int num = 0;</span>
+<span class="source-line-no">397</span><span id="line-397"> while (scanner.next() != null) {</span>
+<span class="source-line-no">398</span><span id="line-398"> num++;</span>
+<span class="source-line-no">399</span><span id="line-399"> }</span>
+<span class="source-line-no">400</span><span id="line-400"> assertEquals(1, num);</span>
+<span class="source-line-no">401</span><span id="line-401"> }</span>
+<span class="source-line-no">402</span><span id="line-402"></span>
+<span class="source-line-no">403</span><span id="line-403"> return null;</span>
+<span class="source-line-no">404</span><span id="line-404"> }</span>
+<span class="source-line-no">405</span><span id="line-405"> });</span>
+<span class="source-line-no">406</span><span id="line-406"> }</span>
+<span class="source-line-no">407</span><span id="line-407"></span>
+<span class="source-line-no">408</span><span id="line-408"> /**</span>
+<span class="source-line-no">409</span><span id="line-409"> * Test the equivalence of a scan versus the same scan executed when heartbeat messages are</span>
+<span class="source-line-no">410</span><span id="line-410"> * necessary</span>
+<span class="source-line-no">411</span><span id="line-411"> * @param scan The scan configuration being tested</span>
+<span class="source-line-no">412</span><span id="line-412"> * @param rowSleepTime The time to sleep between fetches of row cells</span>
+<span class="source-line-no">413</span><span id="line-413"> * @param cfSleepTime The time to sleep between fetches of column family cells</span>
+<span class="source-line-no">414</span><span id="line-414"> * @param sleepBeforeCf set to true when column family sleeps should occur before the cells for</span>
+<span class="source-line-no">415</span><span id="line-415"> * that column family are fetched</span>
+<span class="source-line-no">416</span><span id="line-416"> */</span>
+<span class="source-line-no">417</span><span id="line-417"> private void testEquivalenceOfScanWithHeartbeats(final Scan scan, int rowSleepTime,</span>
+<span class="source-line-no">418</span><span id="line-418"> int cfSleepTime, boolean sleepBeforeCf) throws Exception {</span>
+<span class="source-line-no">419</span><span id="line-419"> disableSleeping();</span>
+<span class="source-line-no">420</span><span id="line-420"> AsyncTable<AdvancedScanResultConsumer> table = CONN.getTable(TABLE_NAME);</span>
+<span class="source-line-no">421</span><span id="line-421"> final ResultScanner scanner = new ScanPerNextResultScanner(table, scan);</span>
+<span class="source-line-no">422</span><span id="line-422"> final ResultScanner scannerWithHeartbeats = new ScanPerNextResultScanner(table, scan);</span>
+<span class="source-line-no">423</span><span id="line-423"></span>
+<span class="source-line-no">424</span><span id="line-424"> Result r1 = null;</span>
+<span class="source-line-no">425</span><span id="line-425"> Result r2 = null;</span>
+<span class="source-line-no">426</span><span id="line-426"></span>
+<span class="source-line-no">427</span><span id="line-427"> while ((r1 = scanner.next()) != null) {</span>
+<span class="source-line-no">428</span><span id="line-428"> // Enforce the specified sleep conditions during calls to the heartbeat scanner</span>
+<span class="source-line-no">429</span><span id="line-429"> configureSleepTime(rowSleepTime, cfSleepTime, sleepBeforeCf);</span>
+<span class="source-line-no">430</span><span id="line-430"> r2 = scannerWithHeartbeats.next();</span>
+<span class="source-line-no">431</span><span id="line-431"> disableSleeping();</span>
<span class="source-line-no">432</span><span id="line-432"></span>
-<span class="source-line-no">433</span><span id="line-433"> while ((r1 = scanner.next()) != null) {</span>
-<span class="source-line-no">434</span><span id="line-434"> // Enforce the specified sleep conditions during calls to the heartbeat scanner</span>
-<span class="source-line-no">435</span><span id="line-435"> configureSleepTime(rowSleepTime, cfSleepTime, sleepBeforeCf);</span>
-<span class="source-line-no">436</span><span id="line-436"> r2 = scannerWithHeartbeats.next();</span>
-<span class="source-line-no">437</span><span id="line-437"> disableSleeping();</span>
-<span class="source-line-no">438</span><span id="line-438"></span>
-<span class="source-line-no">439</span><span id="line-439"> assertTrue(r2 != null);</span>
-<span class="source-line-no">440</span><span id="line-440"> try {</span>
-<span class="source-line-no">441</span><span id="line-441"> Result.compareResults(r1, r2);</span>
-<span class="source-line-no">442</span><span id="line-442"> } catch (Exception e) {</span>
-<span class="source-line-no">443</span><span id="line-443"> fail(e.getMessage());</span>
-<span class="source-line-no">444</span><span id="line-444"> }</span>
-<span class="source-line-no">445</span><span id="line-445"> }</span>
-<span class="source-line-no">446</span><span id="line-446"></span>
-<span class="source-line-no">447</span><span id="line-447"> assertTrue(scannerWithHeartbeats.next() == null);</span>
-<span class="source-line-no">448</span><span id="line-448"> scanner.close();</span>
-<span class="source-line-no">449</span><span id="line-449"> scannerWithHeartbeats.close();</span>
-<span class="source-line-no">450</span><span id="line-450"> }</span>
-<span class="source-line-no">451</span><span id="line-451"></span>
-<span class="source-line-no">452</span><span id="line-452"> /**</span>
-<span class="source-line-no">453</span><span id="line-453"> * Helper method for setting the time to sleep between rows and column families. If a sleep time</span>
-<span class="source-line-no">454</span><span id="line-454"> * is negative then that sleep will be disabled</span>
-<span class="source-line-no">455</span><span id="line-455"> */</span>
-<span class="source-line-no">456</span><span id="line-456"> private static void configureSleepTime(int rowSleepTime, int cfSleepTime, boolean sleepBeforeCf) {</span>
-<span class="source-line-no">457</span><span id="line-457"> HeartbeatHRegion.sleepBetweenRows = rowSleepTime > 0;</span>
-<span class="source-line-no">458</span><span id="line-458"> HeartbeatHRegion.rowSleepTime = rowSleepTime;</span>
-<span class="source-line-no">459</span><span id="line-459"></span>
-<span class="source-line-no">460</span><span id="line-460"> HeartbeatHRegion.sleepBetweenColumnFamilies = cfSleepTime > 0;</span>
-<span class="source-line-no">461</span><span id="line-461"> HeartbeatHRegion.columnFamilySleepTime = cfSleepTime;</span>
-<span class="source-line-no">462</span><span id="line-462"> HeartbeatHRegion.sleepBeforeColumnFamily = sleepBeforeCf;</span>
-<span class="source-line-no">463</span><span id="line-463"> }</span>
-<span class="source-line-no">464</span><span id="line-464"></span>
-<span class="source-line-no">465</span><span id="line-465"> /**</span>
-<span class="source-line-no">466</span><span id="line-466"> * Disable the sleeping mechanism server side.</span>
-<span class="source-line-no">467</span><span id="line-467"> */</span>
-<span class="source-line-no">468</span><span id="line-468"> private static void disableSleeping() {</span>
-<span class="source-line-no">469</span><span id="line-469"> HeartbeatHRegion.sleepBetweenRows = false;</span>
-<span class="source-line-no">470</span><span id="line-470"> HeartbeatHRegion.sleepBetweenColumnFamilies = false;</span>
-<span class="source-line-no">471</span><span id="line-471"> }</span>
-<span class="source-line-no">472</span><span id="line-472"></span>
-<span class="source-line-no">473</span><span id="line-473"> /**</span>
-<span class="source-line-no">474</span><span id="line-474"> * Custom HRegionServer instance that instantiates {@link HeartbeatRPCServices} in place of</span>
-<span class="source-line-no">475</span><span id="line-475"> * {@link RSRpcServices} to allow us to toggle support for heartbeat messages</span>
-<span class="source-line-no">476</span><span id="line-476"> */</span>
-<span class="source-line-no">477</span><span id="line-477"> private static class HeartbeatHRegionServer extends HRegionServer {</span>
-<span class="source-line-no">478</span><span id="line-478"> public HeartbeatHRegionServer(Configuration conf) throws IOException, InterruptedException {</span>
-<span class="source-line-no">479</span><span id="line-479"> super(conf);</span>
-<span class="source-line-no">480</span><span id="line-480"> }</span>
+<span class="source-line-no">433</span><span id="line-433"> assertTrue(r2 != null);</span>
+<span class="source-line-no">434</span><span id="line-434"> try {</span>
+<span class="source-line-no">435</span><span id="line-435"> Result.compareResults(r1, r2);</span>
+<span class="source-line-no">436</span><span id="line-436"> } catch (Exception e) {</span>
+<span class="source-line-no">437</span><span id="line-437"> fail(e.getMessage());</span>
+<span class="source-line-no">438</span><span id="line-438"> }</span>
+<span class="source-line-no">439</span><span id="line-439"> }</span>
+<span class="source-line-no">440</span><span id="line-440"></span>
+<span class="source-line-no">441</span><span id="line-441"> assertTrue(scannerWithHeartbeats.next() == null);</span>
+<span class="source-line-no">442</span><span id="line-442"> scanner.close();</span>
+<span class="source-line-no">443</span><span id="line-443"> scannerWithHeartbeats.close();</span>
+<span class="source-line-no">444</span><span id="line-444"> }</span>
+<span class="source-line-no">445</span><span id="line-445"></span>
+<span class="source-line-no">446</span><span id="line-446"> /**</span>
+<span class="source-line-no">447</span><span id="line-447"> * Helper method for setting the time to sleep between rows and column families. If a sleep time</span>
+<span class="source-line-no">448</span><span id="line-448"> * is negative then that sleep will be disabled</span>
+<span class="source-line-no">449</span><span id="line-449"> */</span>
+<span class="source-line-no">450</span><span id="line-450"> private static void configureSleepTime(int rowSleepTime, int cfSleepTime, boolean sleepBeforeCf) {</span>
+<span class="source-line-no">451</span><span id="line-451"> HeartbeatHRegion.sleepBetweenRows = rowSleepTime > 0;</span>
+<span class="source-line-no">452</span><span id="line-452"> HeartbeatHRegion.rowSleepTime = rowSleepTime;</span>
+<span class="source-line-no">453</span><span id="line-453"></span>
+<span class="source-line-no">454</span><span id="line-454"> HeartbeatHRegion.sleepBetweenColumnFamilies = cfSleepTime > 0;</span>
+<span class="source-line-no">455</span><span id="line-455"> HeartbeatHRegion.columnFamilySleepTime = cfSleepTime;</span>
+<span class="source-line-no">456</span><span id="line-456"> HeartbeatHRegion.sleepBeforeColumnFamily = sleepBeforeCf;</span>
+<span class="source-line-no">457</span><span id="line-457"> }</span>
+<span class="source-line-no">458</span><span id="line-458"></span>
+<span class="source-line-no">459</span><span id="line-459"> /**</span>
+<span class="source-line-no">460</span><span id="line-460"> * Disable the sleeping mechanism server side.</span>
+<span class="source-line-no">461</span><span id="line-461"> */</span>
+<span class="source-line-no">462</span><span id="line-462"> private static void disableSleeping() {</span>
+<span class="source-line-no">463</span><span id="line-463"> HeartbeatHRegion.sleepBetweenRows = false;</span>
+<span class="source-line-no">464</span><span id="line-464"> HeartbeatHRegion.sleepBetweenColumnFamilies = false;</span>
+<span class="source-line-no">465</span><span id="line-465"> }</span>
+<span class="source-line-no">466</span><span id="line-466"></span>
+<span class="source-line-no">467</span><span id="line-467"> /**</span>
+<span class="source-line-no">468</span><span id="line-468"> * Custom HRegionServer instance that instantiates {@link HeartbeatRPCServices} in place of</span>
+<span class="source-line-no">469</span><span id="line-469"> * {@link RSRpcServices} to allow us to toggle support for heartbeat messages</span>
+<span class="source-line-no">470</span><span id="line-470"> */</span>
+<span class="source-line-no">471</span><span id="line-471"> private static class HeartbeatHRegionServer extends HRegionServer {</span>
+<span class="source-line-no">472</span><span id="line-472"> public HeartbeatHRegionServer(Configuration conf) throws IOException, InterruptedException {</span>
+<span class="source-line-no">473</span><span id="line-473"> super(conf);</span>
+<span class="source-line-no">474</span><span id="line-474"> }</span>
+<span class="source-line-no">475</span><span id="line-475"></span>
+<span class="source-line-no">476</span><span id="line-476"> @Override</span>
+<span class="source-line-no">477</span><span id="line-477"> protected RSRpcServices createRpcServices() throws IOException {</span>
+<span class="source-line-no">478</span><span id="line-478"> return new HeartbeatRPCServices(this);</span>
+<span class="source-line-no">479</span><span id="line-479"> }</span>
+<span class="source-line-no">480</span><span id="line-480"> }</span>
<span class="source-line-no">481</span><span id="line-481"></span>
-<span class="source-line-no">482</span><span id="line-482"> @Override</span>
-<span class="source-line-no">483</span><span id="line-483"> protected RSRpcServices createRpcServices() throws IOException {</span>
-<span class="source-line-no">484</span><span id="line-484"> return new HeartbeatRPCServices(this);</span>
-<span class="source-line-no">485</span><span id="line-485"> }</span>
-<span class="source-line-no">486</span><span id="line-486"> }</span>
+<span class="source-line-no">482</span><span id="line-482"> /**</span>
+<span class="source-line-no">483</span><span id="line-483"> * Custom RSRpcServices instance that allows heartbeat support to be toggled</span>
+<span class="source-line-no">484</span><span id="line-484"> */</span>
+<span class="source-line-no">485</span><span id="line-485"> private static class HeartbeatRPCServices extends RSRpcServices {</span>
+<span class="source-line-no">486</span><span id="line-486"> private static volatile boolean heartbeatsEnabled = true;</span>
<span class="source-line-no">487</span><span id="line-487"></span>
-<span class="source-line-no">488</span><span id="line-488"> /**</span>
-<span class="source-line-no">489</span><span id="line-489"> * Custom RSRpcServices instance that allows heartbeat support to be toggled</span>
-<span class="source-line-no">490</span><span id="line-490"> */</span>
-<span class="source-line-no">491</span><span id="line-491"> private static class HeartbeatRPCServices extends RSRpcServices {</span>
-<span class="source-line-no">492</span><span id="line-492"> private static volatile boolean heartbeatsEnabled = true;</span>
-<span class="source-line-no">493</span><span id="line-493"></span>
-<span class="source-line-no">494</span><span id="line-494"> public HeartbeatRPCServices(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">495</span><span id="line-495"> super(rs);</span>
-<span class="source-line-no">496</span><span id="line-496"> }</span>
-<span class="source-line-no">497</span><span id="line-497"></span>
-<span class="source-line-no">498</span><span id="line-498"> @Override</span>
-<span class="source-line-no">499</span><span id="line-499"> public ScanResponse scan(RpcController controller, ScanRequest request)</span>
-<span class="source-line-no">500</span><span id="line-500"> throws ServiceException {</span>
-<span class="source-line-no">501</span><span id="line-501"> ScanRequest.Builder builder = ScanRequest.newBuilder(request);</span>
-<span class="source-line-no">502</span><span id="line-502"> builder.setClientHandlesHeartbeats(heartbeatsEnabled);</span>
-<span class="source-line-no">503</span><span id="line-503"> return super.scan(controller, builder.build());</span>
-<span class="source-line-no">504</span><span id="line-504"> }</span>
-<span class="source-line-no">505</span><span id="line-505"> }</span>
-<span class="source-line-no">506</span><span id="line-506"></span>
-<span class="source-line-no">507</span><span id="line-507"> /**</span>
-<span class="source-line-no">508</span><span id="line-508"> * Custom HRegion class that instantiates {@link RegionScanner}s with configurable sleep times</span>
-<span class="source-line-no">509</span><span id="line-509"> * between fetches of row Results and/or column family cells. Useful for emulating an instance</span>
-<span class="source-line-no">510</span><span id="line-510"> * where the server is taking a long time to process a client's scan request</span>
-<span class="source-line-no">511</span><span id="line-511"> */</span>
-<span class="source-line-no">512</span><span id="line-512"> private static class HeartbeatHRegion extends HRegion {</span>
-<span class="source-line-no">513</span><span id="line-513"> // Row sleeps occur AFTER each row worth of cells is retrieved.</span>
-<span class="source-line-no">514</span><span id="line-514"> private static volatile int rowSleepTime = DEFAULT_ROW_SLEEP_TIME;</span>
-<span class="source-line-no">515</span><span id="line-515"> private static volatile boolean sleepBetweenRows = false;</span>
-<span class="source-line-no">516</span><span id="line-516"></span>
-<span class="source-line-no">517</span><span id="line-517"> // The sleep for column families can be initiated before or after we fetch the cells for the</span>
-<span class="source-line-no">518</span><span id="line-518"> // column family. If the sleep occurs BEFORE then the time limits will be reached inside</span>
-<span class="source-line-no">519</span><span id="line-519"> // StoreScanner while we are fetching individual cells. If the sleep occurs AFTER then the time</span>
-<span class="source-line-no">520</span><span id="line-520"> // limit will be reached inside RegionScanner after all the cells for a column family have been</span>
-<span class="source-line-no">521</span><span id="line-521"> // retrieved.</span>
-<span class="source-line-no">522</span><span id="line-522"> private static volatile boolean sleepBeforeColumnFamily = false;</span>
-<span class="source-line-no">523</span><span id="line-523"> private static volatile int columnFamilySleepTime = DEFAULT_CF_SLEEP_TIME;</span>
-<span class="source-line-no">524</span><span id="line-524"> private static volatile boolean sleepBetweenColumnFamilies = false;</span>
-<span class="source-line-no">525</span><span id="line-525"></span>
-<span class="source-line-no">526</span><span id="line-526"> public HeartbeatHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam,</span>
-<span class="source-line-no">527</span><span id="line-527"> RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) {</span>
-<span class="source-line-no">528</span><span id="line-528"> super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices);</span>
-<span class="source-line-no">529</span><span id="line-529"> }</span>
-<span class="source-line-no">530</span><span id="line-530"></span>
-<span class="source-line-no">531</span><span id="line-531"> public HeartbeatHRegion(HRegionFileSystem fs, WAL wal, Configuration confParam,</span>
-<span class="source-line-no">532</span><span id="line-532"> TableDescriptor htd, RegionServerServices rsServices) {</span>
-<span class="source-line-no">533</span><span id="line-533"> super(fs, wal, confParam, htd, rsServices);</span>
+<span class="source-line-no">488</span><span id="line-488"> public HeartbeatRPCServices(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">489</span><span id="line-489"> super(rs);</span>
+<span class="source-line-no">490</span><span id="line-490"> }</span>
+<span class="source-line-no">491</span><span id="line-491"></span>
+<span class="source-line-no">492</span><span id="line-492"> @Override</span>
+<span class="source-line-no">493</span><span id="line-493"> public ScanResponse scan(RpcController controller, ScanRequest request)</span>
+<span class="source-line-no">494</span><span id="line-494"> throws ServiceException {</span>
+<span class="source-line-no">495</span><span id="line-495"> ScanRequest.Builder builder = ScanRequest.newBuilder(request);</span>
+<span class="source-line-no">496</span><span id="line-496"> builder.setClientHandlesHeartbeats(heartbeatsEnabled);</span>
+<span class="source-line-no">497</span><span id="line-497"> return super.scan(controller, builder.build());</span>
+<span class="source-line-no">498</span><span id="line-498"> }</span>
+<span class="source-line-no">499</span><span id="line-499"> }</span>
+<span class="source-line-no">500</span><span id="line-500"></span>
+<span class="source-line-no">501</span><span id="line-501"> /**</span>
+<span class="source-line-no">502</span><span id="line-502"> * Custom HRegion class that instantiates {@link RegionScanner}s with configurable sleep times</span>
+<span class="source-line-no">503</span><span id="line-503"> * between fetches of row Results and/or column family cells. Useful for emulating an instance</span>
+<span class="source-line-no">504</span><span id="line-504"> * where the server is taking a long time to process a client's scan request</span>
+<span class="source-line-no">505</span><span id="line-505"> */</span>
+<span class="source-line-no">506</span><span id="line-506"> private static class HeartbeatHRegion extends HRegion {</span>
+<span class="source-line-no">507</span><span id="line-507"> // Row sleeps occur AFTER each row worth of cells is retrieved.</span>
+<span class="source-line-no">508</span><span id="line-508"> private static volatile int rowSleepTime = DEFAULT_ROW_SLEEP_TIME;</span>
+<span class="source-line-no">509</span><span id="line-509"> private static volatile boolean sleepBetweenRows = false;</span>
+<span class="source-line-no">510</span><span id="line-510"></span>
+<span class="source-line-no">511</span><span id="line-511"> // The sleep for column families can be initiated before or after we fetch the cells for the</span>
+<span class="source-line-no">512</span><span id="line-512"> // column family. If the sleep occurs BEFORE then the time limits will be reached inside</span>
+<span class="source-line-no">513</span><span id="line-513"> // StoreScanner while we are fetching individual cells. If the sleep occurs AFTER then the time</span>
+<span class="source-line-no">514</span><span id="line-514"> // limit will be reached inside RegionScanner after all the cells for a column family have been</span>
+<span class="source-line-no">515</span><span id="line-515"> // retrieved.</span>
+<span class="source-line-no">516</span><span id="line-516"> private static volatile boolean sleepBeforeColumnFamily = false;</span>
+<span class="source-line-no">517</span><span id="line-517"> private static volatile int columnFamilySleepTime = DEFAULT_CF_SLEEP_TIME;</span>
+<span class="source-line-no">518</span><span id="line-518"> private static volatile boolean sleepBetweenColumnFamilies = false;</span>
+<span class="source-line-no">519</span><span id="line-519"></span>
+<span class="source-line-no">520</span><span id="line-520"> public HeartbeatHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam,</span>
+<span class="source-line-no">521</span><span id="line-521"> RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) {</span>
+<span class="source-line-no">522</span><span id="line-522"> super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices);</span>
+<span class="source-line-no">523</span><span id="line-523"> }</span>
+<span class="source-line-no">524</span><span id="line-524"></span>
+<span class="source-line-no">525</span><span id="line-525"> public HeartbeatHRegion(HRegionFileSystem fs, WAL wal, Configuration confParam,</span>
+<span class="source-line-no">526</span><span id="line-526"> TableDescriptor htd, RegionServerServices rsServices) {</span>
+<span class="source-line-no">527</span><span id="line-527"> super(fs, wal, confParam, htd, rsServices);</span>
+<span class="source-line-no">528</span><span id="line-528"> }</span>
+<span class="source-line-no">529</span><span id="line-529"></span>
+<span class="source-line-no">530</span><span id="line-530"> private static void columnFamilySleep() {</span>
+<span class="source-line-no">531</span><span id="line-531"> if (sleepBetweenColumnFamilies) {</span>
+<span class="source-line-no">532</span><span id="line-532"> Threads.sleepWithoutInterrupt(columnFamilySleepTime);</span>
+<span class="source-line-no">533</span><span id="line-533"> }</span>
<span class="source-line-no">534</span><span id="line-534"> }</span>
<span class="source-line-no">535</span><span id="line-535"></span>
-<span class="source-line-no">536</span><span id="line-536"> private static void columnFamilySleep() {</span>
-<span class="source-line-no">537</span><span id="line-537"> if (sleepBetweenColumnFamilies) {</span>
-<span class="source-line-no">538</span><span id="line-538"> Threads.sleepWithoutInterrupt(columnFamilySleepTime);</span>
+<span class="source-line-no">536</span><span id="line-536"> private static void rowSleep() {</span>
+<span class="source-line-no">537</span><span id="line-537"> if (sleepBetweenRows) {</span>
+<span class="source-line-no">538</span><span id="line-538"> Threads.sleepWithoutInterrupt(rowSleepTime);</span>
<span class="source-line-no">539</span><span id="line-539"> }</span>
<span class="source-line-no">540</span><span id="line-540"> }</span>
<span class="source-line-no">541</span><span id="line-541"></span>
-<span class="source-line-no">542</span><span id="line-542"> private static void rowSleep() {</span>
-<span class="source-line-no">543</span><span id="line-543"> if (sleepBetweenRows) {</span>
-<span class="source-line-no">544</span><span id="line-544"> Threads.sleepWithoutInterrupt(rowSleepTime);</span>
-<span class="source-line-no">545</span><span id="line-545"> }</span>
-<span class="source-line-no">546</span><span id="line-546"> }</span>
-<span class="source-line-no">547</span><span id="line-547"></span>
-<span class="source-line-no">548</span><span id="line-548"> // Instantiate the custom heartbeat region scanners</span>
-<span class="source-line-no">549</span><span id="line-549"> @Override</span>
-<span class="source-line-no">550</span><span id="line-550"> protected RegionScannerImpl instantiateRegionScanner(Scan scan,</span>
-<span class="source-line-no">551</span><span id="line-551"> List<KeyValueScanner> additionalScanners, long nonceGroup, long nonce) throws IOException {</span>
-<span class="source-line-no">552</span><span id="line-552"> if (scan.isReversed()) {</span>
-<span class="source-line-no">553</span><span id="line-553"> if (scan.getFilter() != null) {</span>
-<span class="source-line-no">554</span><span id="line-554"> scan.getFilter().setReversed(true);</span>
-<span class="source-line-no">555</span><span id="line-555"> }</span>
-<span class="source-line-no">556</span><span id="line-556"> return new HeartbeatReversedRegionScanner(scan, additionalScanners, this);</span>
-<span class="source-line-no">557</span><span id="line-557"> }</span>
-<span class="source-line-no">558</span><span id="line-558"> return new HeartbeatRegionScanner(scan, additionalScanners, this);</span>
-<span class="source-line-no">559</span><span id="line-559"> }</span>
-<span class="source-line-no">560</span><span id="line-560"> }</span>
-<span class="source-line-no">561</span><span id="line-561"></span>
-<span class="source-line-no">562</span><span id="line-562"> /**</span>
-<span class="source-line-no">563</span><span id="line-563"> * Custom ReversedRegionScanner that can be configured to sleep between retrievals of row Results</span>
-<span class="source-line-no">564</span><span id="line-564"> * and/or column family cells</span>
-<span class="source-line-no">565</span><span id="line-565"> */</span>
-<span class="source-line-no">566</span><span id="line-566"> private static class HeartbeatReversedRegionScanner extends ReversedRegionScannerImpl {</span>
-<span class="source-line-no">567</span><span id="line-567"> HeartbeatReversedRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners,</span>
-<span class="source-line-no">568</span><span id="line-568"> HRegion region) throws IOException {</span>
-<span class="source-line-no">569</span><span id="line-569"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
-<span class="source-line-no">570</span><span id="line-570"> }</span>
-<span class="source-line-no">571</span><span id="line-571"></span>
-<span class="source-line-no">572</span><span id="line-572"> @Override</span>
-<span class="source-line-no">573</span><span id="line-573"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
-<span class="source-line-no">574</span><span id="line-574"> throws IOException {</span>
-<span class="source-line-no">575</span><span id="line-575"> boolean moreRows = super.nextRaw(outResults, context);</span>
-<span class="source-line-no">576</span><span id="line-576"> HeartbeatHRegion.rowSleep();</span>
-<span class="source-line-no">577</span><span id="line-577"> return moreRows;</span>
-<span class="source-line-no">578</span><span id="line-578"> }</span>
-<span class="source-line-no">579</span><span id="line-579"></span>
-<span class="source-line-no">580</span><span id="line-580"> @Override</span>
-<span class="source-line-no">581</span><span id="line-581"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
-<span class="source-line-no">582</span><span id="line-582"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
-<span class="source-line-no">583</span><span id="line-583"> this.storeHeap =</span>
-<span class="source-line-no">584</span><span id="line-584"> new HeartbeatReversedKVHeap(scanners, (CellComparatorImpl) region.getCellComparator());</span>
-<span class="source-line-no">585</span><span id="line-585"> if (!joinedScanners.isEmpty()) {</span>
-<span class="source-line-no">586</span><span id="line-586"> this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners,</span>
-<span class="source-line-no">587</span><span id="line-587"> (CellComparatorImpl) region.getCellComparator());</span>
-<span class="source-line-no">588</span><span id="line-588"> }</span>
-<span class="source-line-no">589</span><span id="line-589"> }</span>
-<span class="source-line-no">590</span><span id="line-590"> }</span>
-<span class="source-line-no">591</span><span id="line-591"></span>
-<span class="source-line-no">592</span><span id="line-592"> /**</span>
-<span class="source-line-no">593</span><span id="line-593"> * Custom RegionScanner that can be configured to sleep between retrievals of row Results and/or</span>
-<span class="source-line-no">594</span><span id="line-594"> * column family cells</span>
-<span class="source-line-no">595</span><span id="line-595"> */</span>
-<span class="source-line-no">596</span><span id="line-596"> private static class HeartbeatRegionScanner extends RegionScannerImpl {</span>
-<span class="source-line-no">597</span><span id="line-597"> HeartbeatRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners, HRegion region)</span>
+<span class="source-line-no">542</span><span id="line-542"> // Instantiate the custom heartbeat region scanners</span>
+<span class="source-line-no">543</span><span id="line-543"> @Override</span>
+<span class="source-line-no">544</span><span id="line-544"> protected RegionScannerImpl instantiateRegionScanner(Scan scan,</span>
+<span class="source-line-no">545</span><span id="line-545"> List<KeyValueScanner> additionalScanners, long nonceGroup, long nonce) throws IOException {</span>
+<span class="source-line-no">546</span><span id="line-546"> if (scan.isReversed()) {</span>
+<span class="source-line-no">547</span><span id="line-547"> if (scan.getFilter() != null) {</span>
+<span class="source-line-no">548</span><span id="line-548"> scan.getFilter().setReversed(true);</span>
+<span class="source-line-no">549</span><span id="line-549"> }</span>
+<span class="source-line-no">550</span><span id="line-550"> return new HeartbeatReversedRegionScanner(scan, additionalScanners, this);</span>
+<span class="source-line-no">551</span><span id="line-551"> }</span>
+<span class="source-line-no">552</span><span id="line-552"> return new HeartbeatRegionScanner(scan, additionalScanners, this);</span>
+<span class="source-line-no">553</span><span id="line-553"> }</span>
+<span class="source-line-no">554</span><span id="line-554"> }</span>
+<span class="source-line-no">555</span><span id="line-555"></span>
+<span class="source-line-no">556</span><span id="line-556"> /**</span>
+<span class="source-line-no">557</span><span id="line-557"> * Custom ReversedRegionScanner that can be configured to sleep between retrievals of row Results</span>
+<span class="source-line-no">558</span><span id="line-558"> * and/or column family cells</span>
+<span class="source-line-no">559</span><span id="line-559"> */</span>
+<span class="source-line-no">560</span><span id="line-560"> private static class HeartbeatReversedRegionScanner extends ReversedRegionScannerImpl {</span>
+<span class="source-line-no">561</span><span id="line-561"> HeartbeatReversedRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners,</span>
+<span class="source-line-no">562</span><span id="line-562"> HRegion region) throws IOException {</span>
+<span class="source-line-no">563</span><span id="line-563"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
+<span class="source-line-no">564</span><span id="line-564"> }</span>
+<span class="source-line-no">565</span><span id="line-565"></span>
+<span class="source-line-no">566</span><span id="line-566"> @Override</span>
+<span class="source-line-no">567</span><span id="line-567"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
+<span class="source-line-no">568</span><span id="line-568"> throws IOException {</span>
+<span class="source-line-no">569</span><span id="line-569"> boolean moreRows = super.nextRaw(outResults, context);</span>
+<span class="source-line-no">570</span><span id="line-570"> HeartbeatHRegion.rowSleep();</span>
+<span class="source-line-no">571</span><span id="line-571"> return moreRows;</span>
+<span class="source-line-no">572</span><span id="line-572"> }</span>
+<span class="source-line-no">573</span><span id="line-573"></span>
+<span class="source-line-no">574</span><span id="line-574"> @Override</span>
+<span class="source-line-no">575</span><span id="line-575"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
+<span class="source-line-no">576</span><span id="line-576"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
+<span class="source-line-no">577</span><span id="line-577"> this.storeHeap =</span>
+<span class="source-line-no">578</span><span id="line-578"> new HeartbeatReversedKVHeap(scanners, (CellComparatorImpl) region.getCellComparator());</span>
+<span class="source-line-no">579</span><span id="line-579"> if (!joinedScanners.isEmpty()) {</span>
+<span class="source-line-no">580</span><span id="line-580"> this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners,</span>
+<span class="source-line-no">581</span><span id="line-581"> (CellComparatorImpl) region.getCellComparator());</span>
+<span class="source-line-no">582</span><span id="line-582"> }</span>
+<span class="source-line-no">583</span><span id="line-583"> }</span>
+<span class="source-line-no">584</span><span id="line-584"> }</span>
+<span class="source-line-no">585</span><span id="line-585"></span>
+<span class="source-line-no">586</span><span id="line-586"> /**</span>
+<span class="source-line-no">587</span><span id="line-587"> * Custom RegionScanner that can be configured to sleep between retrievals of row Results and/or</span>
+<span class="source-line-no">588</span><span id="line-588"> * column family cells</span>
+<span class="source-line-no">589</span><span id="line-589"> */</span>
+<span class="source-line-no">590</span><span id="line-590"> private static class HeartbeatRegionScanner extends RegionScannerImpl {</span>
+<span class="source-line-no">591</span><span id="line-591"> HeartbeatRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners, HRegion region)</span>
+<span class="source-line-no">592</span><span id="line-592"> throws IOException {</span>
+<span class="source-line-no">593</span><span id="line-593"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
+<span class="source-line-no">594</span><span id="line-594"> }</span>
+<span class="source-line-no">595</span><span id="line-595"></span>
+<span class="source-line-no">596</span><span id="line-596"> @Override</span>
+<span class="source-line-no">597</span><span id="line-597"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
<span class="source-line-no">598</span><span id="line-598"> throws IOException {</span>
-<span class="source-line-no">599</span><span id="line-599"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
-<span class="source-line-no">600</span><span id="line-600"> }</span>
-<span class="source-line-no">601</span><span id="line-601"></span>
-<span class="source-line-no">602</span><span id="line-602"> @Override</span>
-<span class="source-line-no">603</span><span id="line-603"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
-<span class="source-line-no">604</span><span id="line-604"> throws IOException {</span>
-<span class="source-line-no">605</span><span id="line-605"> boolean moreRows = super.nextRaw(outResults, context);</span>
-<span class="source-line-no">606</span><span id="line-606"> HeartbeatHRegion.rowSleep();</span>
-<span class="source-line-no">607</span><span id="line-607"> return moreRows;</span>
-<span class="source-line-no">608</span><span id="line-608"> }</span>
-<span class="source-line-no">609</span><span id="line-609"></span>
-<span class="source-line-no">610</span><span id="line-610"> @Override</span>
-<span class="source-line-no">611</span><span id="line-611"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
-<span class="source-line-no">612</span><span id="line-612"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
-<span class="source-line-no">613</span><span id="line-613"> this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());</span>
-<span class="source-line-no">614</span><span id="line-614"> if (!joinedScanners.isEmpty()) {</span>
-<span class="source-line-no">615</span><span id="line-615"> this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());</span>
-<span class="source-line-no">616</span><span id="line-616"> }</span>
-<span class="source-line-no">617</span><span id="line-617"> }</span>
-<span class="source-line-no">618</span><span id="line-618"> }</span>
-<span class="source-line-no">619</span><span id="line-619"></span>
-<span class="source-line-no">620</span><span id="line-620"> /**</span>
-<span class="source-line-no">621</span><span id="line-621"> * Custom KV Heap that can be configured to sleep/wait in between retrievals of column family</span>
-<span class="source-line-no">622</span><span id="line-622"> * cells. Useful for testing</span>
-<span class="source-line-no">623</span><span id="line-623"> */</span>
-<span class="source-line-no">624</span><span id="line-624"> private static final class HeartbeatKVHeap extends KeyValueHeap {</span>
-<span class="source-line-no">625</span><span id="line-625"> public HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator)</span>
-<span class="source-line-no">626</span><span id="line-626"> throws IOException {</span>
-<span class="source-line-no">627</span><span id="line-627"> super(scanners, comparator);</span>
-<span class="source-line-no">628</span><span id="line-628"> }</span>
-<span class="source-line-no">629</span><span id="line-629"></span>
-<span class="source-line-no">630</span><span id="line-630"> HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, KVScannerComparator comparator)</span>
+<span class="source-line-no">599</span><span id="line-599"> boolean moreRows = super.nextRaw(outResults, context);</span>
+<span class="source-line-no">600</span><span id="line-600"> HeartbeatHRegion.rowSleep();</span>
+<span class="source-line-no">601</span><span id="line-601"> return moreRows;</span>
+<span class="source-line-no">602</span><span id="line-602"> }</span>
+<span class="source-line-no">603</span><span id="line-603"></span>
+<span class="source-line-no">604</span><span id="line-604"> @Override</span>
+<span class="source-line-no">605</span><span id="line-605"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
+<span class="source-line-no">606</span><span id="line-606"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
+<span class="source-line-no">607</span><span id="line-607"> this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());</span>
+<span class="source-line-no">608</span><span id="line-608"> if (!joinedScanners.isEmpty()) {</span>
+<span class="source-line-no">609</span><span id="line-609"> this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());</span>
+<span class="source-line-no">610</span><span id="line-610"> }</span>
+<span class="source-line-no">611</span><span id="line-611"> }</span>
+<span class="source-line-no">612</span><span id="line-612"> }</span>
+<span class="source-line-no">613</span><span id="line-613"></span>
+<span class="source-line-no">614</span><span id="line-614"> /**</span>
+<span class="source-line-no">615</span><span id="line-615"> * Custom KV Heap that can be configured to sleep/wait in between retrievals of column family</span>
+<span class="source-line-no">616</span><span id="line-616"> * cells. Useful for testing</span>
+<span class="source-line-no">617</span><span id="line-617"> */</span>
+<span class="source-line-no">618</span><span id="line-618"> private static final class HeartbeatKVHeap extends KeyValueHeap {</span>
+<span class="source-line-no">619</span><span id="line-619"> public HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator)</span>
+<span class="source-line-no">620</span><span id="line-620"> throws IOException {</span>
+<span class="source-line-no">621</span><span id="line-621"> super(scanners, comparator);</span>
+<span class="source-line-no">622</span><span id="line-622"> }</span>
+<span class="source-line-no">623</span><span id="line-623"></span>
+<span class="source-line-no">624</span><span id="line-624"> HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, KVScannerComparator comparator)</span>
+<span class="source-line-no">625</span><span id="line-625"> throws IOException {</span>
+<span class="source-line-no">626</span><span id="line-626"> super(scanners, comparator);</span>
+<span class="source-line-no">627</span><span id="line-627"> }</span>
+<span class="source-line-no">628</span><span id="line-628"></span>
+<span class="source-line-no">629</span><span id="line-629"> @Override</span>
+<span class="source-line-no">630</span><span id="line-630"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
<span class="source-line-no">631</span><span id="line-631"> throws IOException {</span>
-<span class="source-line-no">632</span><span id="line-632"> super(scanners, comparator);</span>
-<span class="source-line-no">633</span><span id="line-633"> }</span>
-<span class="source-line-no">634</span><span id="line-634"></span>
-<span class="source-line-no">635</span><span id="line-635"> @Override</span>
-<span class="source-line-no">636</span><span id="line-636"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
-<span class="source-line-no">637</span><span id="line-637"> throws IOException {</span>
-<span class="source-line-no">638</span><span id="line-638"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">639</span><span id="line-639"> boolean moreRows = super.next(result, context);</span>
-<span class="source-line-no">640</span><span id="line-640"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">641</span><span id="line-641"> return moreRows;</span>
-<span class="source-line-no">642</span><span id="line-642"> }</span>
-<span class="source-line-no">643</span><span id="line-643"> }</span>
-<span class="source-line-no">644</span><span id="line-644"></span>
-<span class="source-line-no">645</span><span id="line-645"> /**</span>
-<span class="source-line-no">646</span><span id="line-646"> * Custom reversed KV Heap that can be configured to sleep in between retrievals of column family</span>
-<span class="source-line-no">647</span><span id="line-647"> * cells.</span>
-<span class="source-line-no">648</span><span id="line-648"> */</span>
-<span class="source-line-no">649</span><span id="line-649"> private static final class HeartbeatReversedKVHeap extends ReversedKeyValueHeap {</span>
-<span class="source-line-no">650</span><span id="line-650"> public HeartbeatReversedKVHeap(List<? extends KeyValueScanner> scanners,</span>
-<span class="source-line-no">651</span><span id="line-651"> CellComparatorImpl comparator) throws IOException {</span>
-<span class="source-line-no">652</span><span id="line-652"> super(scanners, comparator);</span>
-<span class="source-line-no">653</span><span id="line-653"> }</span>
-<span class="source-line-no">654</span><span id="line-654"></span>
-<span class="source-line-no">655</span><span id="line-655"> @Override</span>
-<span class="source-line-no">656</span><span id="line-656"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
-<span class="source-line-no">657</span><span id="line-657"> throws IOException {</span>
-<span class="source-line-no">658</span><span id="line-658"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">659</span><span id="line-659"> boolean moreRows = super.next(result, context);</span>
-<span class="source-line-no">660</span><span id="line-660"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">661</span><span id="line-661"> return moreRows;</span>
-<span class="source-line-no">662</span><span id="line-662"> }</span>
-<span class="source-line-no">663</span><span id="line-663"> }</span>
-<span class="source-line-no">664</span><span id="line-664">}</span>
+<span class="source-line-no">632</span><span id="line-632"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">633</span><span id="line-633"> boolean moreRows = super.next(result, context);</span>
+<span class="source-line-no">634</span><span id="line-634"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">635</span><span id="line-635"> return moreRows;</span>
+<span class="source-line-no">636</span><span id="line-636"> }</span>
+<span class="source-line-no">637</span><span id="line-637"> }</span>
+<span class="source-line-no">638</span><span id="line-638"></span>
+<span class="source-line-no">639</span><span id="line-639"> /**</span>
+<span class="source-line-no">640</span><span id="line-640"> * Custom reversed KV Heap that can be configured to sleep in between retrievals of column family</span>
+<span class="source-line-no">641</span><span id="line-641"> * cells.</span>
+<span class="source-line-no">642</span><span id="line-642"> */</span>
+<span class="source-line-no">643</span><span id="line-643"> private static final class HeartbeatReversedKVHeap extends ReversedKeyValueHeap {</span>
+<span class="source-line-no">644</span><span id="line-644"> public HeartbeatReversedKVHeap(List<? extends KeyValueScanner> scanners,</span>
+<span class="source-line-no">645</span><span id="line-645"> CellComparatorImpl comparator) throws IOException {</span>
+<span class="source-line-no">646</span><span id="line-646"> super(scanners, comparator);</span>
+<span class="source-line-no">647</span><span id="line-647"> }</span>
+<span class="source-line-no">648</span><span id="line-648"></span>
+<span class="source-line-no">649</span><span id="line-649"> @Override</span>
+<span class="source-line-no">650</span><span id="line-650"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
+<span class="source-line-no">651</span><span id="line-651"> throws IOException {</span>
+<span class="source-line-no">652</span><span id="line-652"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">653</span><span id="line-653"> boolean moreRows = super.next(result, context);</span>
+<span class="source-line-no">654</span><span id="line-654"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">655</span><span id="line-655"> return moreRows;</span>
+<span class="source-line-no">656</span><span id="line-656"> }</span>
+<span class="source-line-no">657</span><span id="line-657"> }</span>
+<span class="source-line-no">658</span><span id="line-658">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html
index 211d0855283..64a773931f9 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.html
@@ -31,9 +31,9 @@
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
<span class="source-line-no">020</span><span id="line-20">import static org.apache.hadoop.hbase.regionserver.RSRpcServices.DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">022</span><span id="line-22">import static org.junit.Assert.assertTrue;</span>
-<span class="source-line-no">023</span><span id="line-23">import static org.junit.Assert.fail;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">022</span><span id="line-22">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
+<span class="source-line-no">023</span><span id="line-23">import static org.junit.jupiter.api.Assertions.fail;</span>
<span class="source-line-no">024</span><span id="line-24">import static org.mockito.Mockito.when;</span>
<span class="source-line-no">025</span><span id="line-25"></span>
<span class="source-line-no">026</span><span id="line-26">import java.io.IOException;</span>
@@ -49,632 +49,626 @@
<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.CellComparatorImpl;</span>
<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.CellUtil;</span>
<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.ExtendedCell;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.HTestConst;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.KeyValue;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.AsyncConnection;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.AsyncTable;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.RegionInfo;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.client.ScanPerNextResultScanner;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
-<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.filter.Filter;</span>
-<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.filter.FilterBase;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.ipc.HBaseRpcController;</span>
-<span class="source-line-no">060</span><span id="line-60">import org.apache.hadoop.hbase.ipc.RpcCall;</span>
-<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
-<span class="source-line-no">062</span><span id="line-62">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">063</span><span id="line-63">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
-<span class="source-line-no">064</span><span id="line-64">import org.apache.hadoop.hbase.util.Threads;</span>
-<span class="source-line-no">065</span><span id="line-65">import org.apache.hadoop.hbase.wal.WAL;</span>
-<span class="source-line-no">066</span><span id="line-66">import org.junit.After;</span>
-<span class="source-line-no">067</span><span id="line-67">import org.junit.AfterClass;</span>
-<span class="source-line-no">068</span><span id="line-68">import org.junit.Before;</span>
-<span class="source-line-no">069</span><span id="line-69">import org.junit.BeforeClass;</span>
-<span class="source-line-no">070</span><span id="line-70">import org.junit.ClassRule;</span>
-<span class="source-line-no">071</span><span id="line-71">import org.junit.Test;</span>
-<span class="source-line-no">072</span><span id="line-72">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">073</span><span id="line-73">import org.mockito.Mockito;</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">import org.apache.hbase.thirdparty.com.google.common.io.Closeables;</span>
-<span class="source-line-no">076</span><span id="line-76">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
-<span class="source-line-no">077</span><span id="line-77">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
-<span class="source-line-no">078</span><span id="line-78"></span>
-<span class="source-line-no">079</span><span id="line-79">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;</span>
-<span class="source-line-no">080</span><span id="line-80">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82">/**</span>
-<span class="source-line-no">083</span><span id="line-83"> * Here we test to make sure that scans return the expected Results when the server is sending the</span>
-<span class="source-line-no">084</span><span id="line-84"> * Client heartbeat messages. Heartbeat messages are essentially keep-alive messages (they prevent</span>
-<span class="source-line-no">085</span><span id="line-85"> * the scanner on the client side from timing out). A heartbeat message is sent from the server to</span>
-<span class="source-line-no">086</span><span id="line-86"> * the client when the server has exceeded the time limit during the processing of the scan. When</span>
-<span class="source-line-no">087</span><span id="line-87"> * the time limit is reached, the server will return to the Client whatever Results it has</span>
-<span class="source-line-no">088</span><span id="line-88"> * accumulated (potentially empty).</span>
-<span class="source-line-no">089</span><span id="line-89"> */</span>
-<span class="source-line-no">090</span><span id="line-90">@Category(LargeTests.class)</span>
-<span class="source-line-no">091</span><span id="line-91">public class TestScannerHeartbeatMessages {</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.HTestConst;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.KeyValue;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.client.AsyncConnection;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.client.AsyncTable;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.client.RegionInfo;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">053</span><span id="line-53">import org.apache.hadoop.hbase.client.ScanPerNextResultScanner;</span>
+<span class="source-line-no">054</span><span id="line-54">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
+<span class="source-line-no">056</span><span id="line-56">import org.apache.hadoop.hbase.filter.Filter;</span>
+<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.filter.FilterBase;</span>
+<span class="source-line-no">058</span><span id="line-58">import org.apache.hadoop.hbase.ipc.HBaseRpcController;</span>
+<span class="source-line-no">059</span><span id="line-59">import org.apache.hadoop.hbase.ipc.RpcCall;</span>
+<span class="source-line-no">060</span><span id="line-60">import org.apache.hadoop.hbase.testclassification.LargeTests;</span>
+<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">062</span><span id="line-62">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
+<span class="source-line-no">063</span><span id="line-63">import org.apache.hadoop.hbase.util.Threads;</span>
+<span class="source-line-no">064</span><span id="line-64">import org.apache.hadoop.hbase.wal.WAL;</span>
+<span class="source-line-no">065</span><span id="line-65">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">066</span><span id="line-66">import org.junit.jupiter.api.AfterEach;</span>
+<span class="source-line-no">067</span><span id="line-67">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">068</span><span id="line-68">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">069</span><span id="line-69">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">070</span><span id="line-70">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">071</span><span id="line-71">import org.mockito.Mockito;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">import org.apache.hbase.thirdparty.com.google.common.io.Closeables;</span>
+<span class="source-line-no">074</span><span id="line-74">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
+<span class="source-line-no">075</span><span id="line-75">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanRequest;</span>
+<span class="source-line-no">078</span><span id="line-78">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ScanResponse;</span>
+<span class="source-line-no">079</span><span id="line-79"></span>
+<span class="source-line-no">080</span><span id="line-80">/**</span>
+<span class="source-line-no">081</span><span id="line-81"> * Here we test to make sure that scans return the expected Results when the server is sending the</span>
+<span class="source-line-no">082</span><span id="line-82"> * Client heartbeat messages. Heartbeat messages are essentially keep-alive messages (they prevent</span>
+<span class="source-line-no">083</span><span id="line-83"> * the scanner on the client side from timing out). A heartbeat message is sent from the server to</span>
+<span class="source-line-no">084</span><span id="line-84"> * the client when the server has exceeded the time limit during the processing of the scan. When</span>
+<span class="source-line-no">085</span><span id="line-85"> * the time limit is reached, the server will return to the Client whatever Results it has</span>
+<span class="source-line-no">086</span><span id="line-86"> * accumulated (potentially empty).</span>
+<span class="source-line-no">087</span><span id="line-87"> */</span>
+<span class="source-line-no">088</span><span id="line-88">@Tag(LargeTests.TAG)</span>
+<span class="source-line-no">089</span><span id="line-89">public class TestScannerHeartbeatMessages {</span>
+<span class="source-line-no">090</span><span id="line-90"></span>
+<span class="source-line-no">091</span><span id="line-91"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93"> @ClassRule</span>
-<span class="source-line-no">094</span><span id="line-94"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">095</span><span id="line-95"> HBaseClassTestRule.forClass(TestScannerHeartbeatMessages.class);</span>
-<span class="source-line-no">096</span><span id="line-96"></span>
-<span class="source-line-no">097</span><span id="line-97"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99"> private static AsyncConnection CONN;</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101"> /**</span>
-<span class="source-line-no">102</span><span id="line-102"> * Table configuration</span>
-<span class="source-line-no">103</span><span id="line-103"> */</span>
-<span class="source-line-no">104</span><span id="line-104"> private static TableName TABLE_NAME = TableName.valueOf("testScannerHeartbeatMessagesTable");</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106"> private static int NUM_ROWS = 5;</span>
-<span class="source-line-no">107</span><span id="line-107"> private static byte[] ROW = Bytes.toBytes("testRow");</span>
-<span class="source-line-no">108</span><span id="line-108"> private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);</span>
-<span class="source-line-no">109</span><span id="line-109"></span>
-<span class="source-line-no">110</span><span id="line-110"> private static int NUM_FAMILIES = 4;</span>
-<span class="source-line-no">111</span><span id="line-111"> private static byte[] FAMILY = Bytes.toBytes("testFamily");</span>
-<span class="source-line-no">112</span><span id="line-112"> private static byte[][] FAMILIES = HTestConst.makeNAscii(FAMILY, NUM_FAMILIES);</span>
-<span class="source-line-no">113</span><span id="line-113"></span>
-<span class="source-line-no">114</span><span id="line-114"> private static int NUM_QUALIFIERS = 3;</span>
-<span class="source-line-no">115</span><span id="line-115"> private static byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
-<span class="source-line-no">116</span><span id="line-116"> private static byte[][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, NUM_QUALIFIERS);</span>
-<span class="source-line-no">117</span><span id="line-117"></span>
-<span class="source-line-no">118</span><span id="line-118"> private static int VALUE_SIZE = 128;</span>
-<span class="source-line-no">119</span><span id="line-119"> private static byte[] VALUE = Bytes.createMaxByteArray(VALUE_SIZE);</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121"> // The time limit should be based on the rpc timeout at client, or the client will regards</span>
-<span class="source-line-no">122</span><span id="line-122"> // the request as timeout before server return a heartbeat.</span>
-<span class="source-line-no">123</span><span id="line-123"> private static int SERVER_TIMEOUT = 60000;</span>
-<span class="source-line-no">124</span><span id="line-124"></span>
-<span class="source-line-no">125</span><span id="line-125"> // Time, in milliseconds, that the client will wait for a response from the server before timing</span>
-<span class="source-line-no">126</span><span id="line-126"> // out. This value is used server side to determine when it is necessary to send a heartbeat</span>
-<span class="source-line-no">127</span><span id="line-127"> // message to the client. Time limit will be 500 ms.</span>
-<span class="source-line-no">128</span><span id="line-128"> private static int CLIENT_TIMEOUT = 1000;</span>
-<span class="source-line-no">129</span><span id="line-129"></span>
-<span class="source-line-no">130</span><span id="line-130"> // In this test, we sleep after reading each row. So we should make sure after we get some number</span>
-<span class="source-line-no">131</span><span id="line-131"> // of rows and sleep same times we must reach time limit, and do not timeout after next sleeping.</span>
-<span class="source-line-no">132</span><span id="line-132"> private static int DEFAULT_ROW_SLEEP_TIME = 300;</span>
-<span class="source-line-no">133</span><span id="line-133"></span>
-<span class="source-line-no">134</span><span id="line-134"> // Similar with row sleep time.</span>
-<span class="source-line-no">135</span><span id="line-135"> private static int DEFAULT_CF_SLEEP_TIME = 300;</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137"> @BeforeClass</span>
-<span class="source-line-no">138</span><span id="line-138"> public static void setUpBeforeClass() throws Exception {</span>
-<span class="source-line-no">139</span><span id="line-139"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">093</span><span id="line-93"> private static AsyncConnection CONN;</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95"> /**</span>
+<span class="source-line-no">096</span><span id="line-96"> * Table configuration</span>
+<span class="source-line-no">097</span><span id="line-97"> */</span>
+<span class="source-line-no">098</span><span id="line-98"> private static TableName TABLE_NAME = TableName.valueOf("testScannerHeartbeatMessagesTable");</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100"> private static int NUM_ROWS = 5;</span>
+<span class="source-line-no">101</span><span id="line-101"> private static byte[] ROW = Bytes.toBytes("testRow");</span>
+<span class="source-line-no">102</span><span id="line-102"> private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104"> private static int NUM_FAMILIES = 4;</span>
+<span class="source-line-no">105</span><span id="line-105"> private static byte[] FAMILY = Bytes.toBytes("testFamily");</span>
+<span class="source-line-no">106</span><span id="line-106"> private static byte[][] FAMILIES = HTestConst.makeNAscii(FAMILY, NUM_FAMILIES);</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108"> private static int NUM_QUALIFIERS = 3;</span>
+<span class="source-line-no">109</span><span id="line-109"> private static byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
+<span class="source-line-no">110</span><span id="line-110"> private static byte[][] QUALIFIERS = HTestConst.makeNAscii(QUALIFIER, NUM_QUALIFIERS);</span>
+<span class="source-line-no">111</span><span id="line-111"></span>
+<span class="source-line-no">112</span><span id="line-112"> private static int VALUE_SIZE = 128;</span>
+<span class="source-line-no">113</span><span id="line-113"> private static byte[] VALUE = Bytes.createMaxByteArray(VALUE_SIZE);</span>
+<span class="source-line-no">114</span><span id="line-114"></span>
+<span class="source-line-no">115</span><span id="line-115"> // The time limit should be based on the rpc timeout at client, or the client will regards</span>
+<span class="source-line-no">116</span><span id="line-116"> // the request as timeout before server return a heartbeat.</span>
+<span class="source-line-no">117</span><span id="line-117"> private static int SERVER_TIMEOUT = 60000;</span>
+<span class="source-line-no">118</span><span id="line-118"></span>
+<span class="source-line-no">119</span><span id="line-119"> // Time, in milliseconds, that the client will wait for a response from the server before timing</span>
+<span class="source-line-no">120</span><span id="line-120"> // out. This value is used server side to determine when it is necessary to send a heartbeat</span>
+<span class="source-line-no">121</span><span id="line-121"> // message to the client. Time limit will be 500 ms.</span>
+<span class="source-line-no">122</span><span id="line-122"> private static int CLIENT_TIMEOUT = 1000;</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124"> // In this test, we sleep after reading each row. So we should make sure after we get some number</span>
+<span class="source-line-no">125</span><span id="line-125"> // of rows and sleep same times we must reach time limit, and do not timeout after next sleeping.</span>
+<span class="source-line-no">126</span><span id="line-126"> private static int DEFAULT_ROW_SLEEP_TIME = 300;</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128"> // Similar with row sleep time.</span>
+<span class="source-line-no">129</span><span id="line-129"> private static int DEFAULT_CF_SLEEP_TIME = 300;</span>
+<span class="source-line-no">130</span><span id="line-130"></span>
+<span class="source-line-no">131</span><span id="line-131"> @BeforeAll</span>
+<span class="source-line-no">132</span><span id="line-132"> public static void setUpBeforeClass() throws Exception {</span>
+<span class="source-line-no">133</span><span id="line-133"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">134</span><span id="line-134"></span>
+<span class="source-line-no">135</span><span id="line-135"> conf.setStrings(HConstants.REGION_IMPL, HeartbeatHRegion.class.getName());</span>
+<span class="source-line-no">136</span><span id="line-136"> conf.setStrings(HConstants.REGION_SERVER_IMPL, HeartbeatHRegionServer.class.getName());</span>
+<span class="source-line-no">137</span><span id="line-137"> conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SERVER_TIMEOUT);</span>
+<span class="source-line-no">138</span><span id="line-138"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, SERVER_TIMEOUT);</span>
+<span class="source-line-no">139</span><span id="line-139"> conf.setInt(HConstants.HBASE_CLIENT_PAUSE, 1);</span>
<span class="source-line-no">140</span><span id="line-140"></span>
-<span class="source-line-no">141</span><span id="line-141"> conf.setStrings(HConstants.REGION_IMPL, HeartbeatHRegion.class.getName());</span>
-<span class="source-line-no">142</span><span id="line-142"> conf.setStrings(HConstants.REGION_SERVER_IMPL, HeartbeatHRegionServer.class.getName());</span>
-<span class="source-line-no">143</span><span id="line-143"> conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, SERVER_TIMEOUT);</span>
-<span class="source-line-no">144</span><span id="line-144"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, SERVER_TIMEOUT);</span>
-<span class="source-line-no">145</span><span id="line-145"> conf.setInt(HConstants.HBASE_CLIENT_PAUSE, 1);</span>
+<span class="source-line-no">141</span><span id="line-141"> // Check the timeout condition after every cell</span>
+<span class="source-line-no">142</span><span id="line-142"> conf.setLong(StoreScanner.HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK, 1);</span>
+<span class="source-line-no">143</span><span id="line-143"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145"> createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);</span>
<span class="source-line-no">146</span><span id="line-146"></span>
-<span class="source-line-no">147</span><span id="line-147"> // Check the timeout condition after every cell</span>
-<span class="source-line-no">148</span><span id="line-148"> conf.setLong(StoreScanner.HBASE_CELLS_SCANNED_PER_HEARTBEAT_CHECK, 1);</span>
-<span class="source-line-no">149</span><span id="line-149"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">150</span><span id="line-150"></span>
-<span class="source-line-no">151</span><span id="line-151"> createTestTable(TABLE_NAME, ROWS, FAMILIES, QUALIFIERS, VALUE);</span>
+<span class="source-line-no">147</span><span id="line-147"> Configuration newConf = new Configuration(conf);</span>
+<span class="source-line-no">148</span><span id="line-148"> newConf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, CLIENT_TIMEOUT);</span>
+<span class="source-line-no">149</span><span id="line-149"> newConf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, CLIENT_TIMEOUT);</span>
+<span class="source-line-no">150</span><span id="line-150"> CONN = ConnectionFactory.createAsyncConnection(newConf).get();</span>
+<span class="source-line-no">151</span><span id="line-151"> }</span>
<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> Configuration newConf = new Configuration(conf);</span>
-<span class="source-line-no">154</span><span id="line-154"> newConf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, CLIENT_TIMEOUT);</span>
-<span class="source-line-no">155</span><span id="line-155"> newConf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, CLIENT_TIMEOUT);</span>
-<span class="source-line-no">156</span><span id="line-156"> CONN = ConnectionFactory.createAsyncConnection(newConf).get();</span>
-<span class="source-line-no">157</span><span id="line-157"> }</span>
-<span class="source-line-no">158</span><span id="line-158"></span>
-<span class="source-line-no">159</span><span id="line-159"> @Test</span>
-<span class="source-line-no">160</span><span id="line-160"> public void testTimeLimitAccountsForQueueTime() throws IOException, InterruptedException {</span>
-<span class="source-line-no">161</span><span id="line-161"> HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
-<span class="source-line-no">162</span><span id="line-162"> RSRpcServices services = new RSRpcServices(rs);</span>
-<span class="source-line-no">163</span><span id="line-163"> RpcCall mockRpcCall = Mockito.mock(RpcCall.class);</span>
-<span class="source-line-no">164</span><span id="line-164"> // first return 180 (minimal queuing), then 120 (more queueing), then 101 (heavy queueing)</span>
-<span class="source-line-no">165</span><span id="line-165"> // finally, 25 is fatal levels of queueing -- exceeding timeout</span>
-<span class="source-line-no">166</span><span id="line-166"> when(mockRpcCall.getReceiveTime()).thenReturn(180L, 120L, 101L, 25L);</span>
-<span class="source-line-no">167</span><span id="line-167"></span>
-<span class="source-line-no">168</span><span id="line-168"> // assume timeout of 100ms</span>
-<span class="source-line-no">169</span><span id="line-169"> HBaseRpcController mockController = Mockito.mock(HBaseRpcController.class);</span>
-<span class="source-line-no">170</span><span id="line-170"> when(mockController.getCallTimeout()).thenReturn(100);</span>
-<span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172"> // current time is 100, which we'll subtract from 90 and 50 to generate some time deltas</span>
-<span class="source-line-no">173</span><span id="line-173"> EnvironmentEdgeManager.injectEdge(() -> 200L);</span>
-<span class="source-line-no">174</span><span id="line-174"></span>
-<span class="source-line-no">175</span><span id="line-175"> try {</span>
-<span class="source-line-no">176</span><span id="line-176"> // we queued for 20ms, leaving 80ms of timeout, which we divide by 2</span>
-<span class="source-line-no">177</span><span id="line-177"> assertEquals(200 + (100 - 20) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">178</span><span id="line-178"> // we queued for 80ms, leaving 20ms of timeout, which we divide by 2</span>
-<span class="source-line-no">179</span><span id="line-179"> assertEquals(200 + (100 - 80) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">180</span><span id="line-180"> // we queued for 99ms of 100ms timeout, leaving only 1ms. we fall back to default minimum</span>
-<span class="source-line-no">181</span><span id="line-181"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
-<span class="source-line-no">182</span><span id="line-182"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">183</span><span id="line-183"> // lastly, we queue for 175ms of 100ms timeout. this should be very rare since we drop</span>
-<span class="source-line-no">184</span><span id="line-184"> // timed out calls in the queue. in this case we still fallback on default minimum for now.</span>
-<span class="source-line-no">185</span><span id="line-185"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
-<span class="source-line-no">186</span><span id="line-186"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
-<span class="source-line-no">187</span><span id="line-187"> } finally {</span>
-<span class="source-line-no">188</span><span id="line-188"> EnvironmentEdgeManager.reset();</span>
-<span class="source-line-no">189</span><span id="line-189"> }</span>
-<span class="source-line-no">190</span><span id="line-190"></span>
-<span class="source-line-no">191</span><span id="line-191"> }</span>
-<span class="source-line-no">192</span><span id="line-192"></span>
-<span class="source-line-no">193</span><span id="line-193"> static void createTestTable(TableName name, byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
-<span class="source-line-no">194</span><span id="line-194"> byte[] cellValue) throws IOException {</span>
-<span class="source-line-no">195</span><span id="line-195"> Table ht = TEST_UTIL.createTable(name, families);</span>
-<span class="source-line-no">196</span><span id="line-196"> List<Put> puts = createPuts(rows, families, qualifiers, cellValue);</span>
-<span class="source-line-no">197</span><span id="line-197"> ht.put(puts);</span>
-<span class="source-line-no">198</span><span id="line-198"> }</span>
-<span class="source-line-no">199</span><span id="line-199"></span>
-<span class="source-line-no">200</span><span id="line-200"> /**</span>
-<span class="source-line-no">201</span><span id="line-201"> * Make puts to put the input value into each combination of row, family, and qualifier</span>
-<span class="source-line-no">202</span><span id="line-202"> */</span>
-<span class="source-line-no">203</span><span id="line-203"> static ArrayList<Put> createPuts(byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
-<span class="source-line-no">204</span><span id="line-204"> byte[] value) throws IOException {</span>
-<span class="source-line-no">205</span><span id="line-205"> Put put;</span>
-<span class="source-line-no">206</span><span id="line-206"> ArrayList<Put> puts = new ArrayList<>();</span>
-<span class="source-line-no">207</span><span id="line-207"></span>
-<span class="source-line-no">208</span><span id="line-208"> for (int row = 0; row < rows.length; row++) {</span>
-<span class="source-line-no">209</span><span id="line-209"> put = new Put(rows[row]);</span>
-<span class="source-line-no">210</span><span id="line-210"> for (int fam = 0; fam < families.length; fam++) {</span>
-<span class="source-line-no">211</span><span id="line-211"> for (int qual = 0; qual < qualifiers.length; qual++) {</span>
-<span class="source-line-no">212</span><span id="line-212"> KeyValue kv = new KeyValue(rows[row], families[fam], qualifiers[qual], qual, value);</span>
-<span class="source-line-no">213</span><span id="line-213"> put.add(kv);</span>
-<span class="source-line-no">214</span><span id="line-214"> }</span>
-<span class="source-line-no">215</span><span id="line-215"> }</span>
-<span class="source-line-no">216</span><span id="line-216"> puts.add(put);</span>
-<span class="source-line-no">217</span><span id="line-217"> }</span>
-<span class="source-line-no">218</span><span id="line-218"></span>
-<span class="source-line-no">219</span><span id="line-219"> return puts;</span>
+<span class="source-line-no">153</span><span id="line-153"> @Test</span>
+<span class="source-line-no">154</span><span id="line-154"> public void testTimeLimitAccountsForQueueTime() throws IOException, InterruptedException {</span>
+<span class="source-line-no">155</span><span id="line-155"> HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);</span>
+<span class="source-line-no">156</span><span id="line-156"> RSRpcServices services = new RSRpcServices(rs);</span>
+<span class="source-line-no">157</span><span id="line-157"> RpcCall mockRpcCall = Mockito.mock(RpcCall.class);</span>
+<span class="source-line-no">158</span><span id="line-158"> // first return 180 (minimal queuing), then 120 (more queueing), then 101 (heavy queueing)</span>
+<span class="source-line-no">159</span><span id="line-159"> // finally, 25 is fatal levels of queueing -- exceeding timeout</span>
+<span class="source-line-no">160</span><span id="line-160"> when(mockRpcCall.getReceiveTime()).thenReturn(180L, 120L, 101L, 25L);</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162"> // assume timeout of 100ms</span>
+<span class="source-line-no">163</span><span id="line-163"> HBaseRpcController mockController = Mockito.mock(HBaseRpcController.class);</span>
+<span class="source-line-no">164</span><span id="line-164"> when(mockController.getCallTimeout()).thenReturn(100);</span>
+<span class="source-line-no">165</span><span id="line-165"></span>
+<span class="source-line-no">166</span><span id="line-166"> // current time is 100, which we'll subtract from 90 and 50 to generate some time deltas</span>
+<span class="source-line-no">167</span><span id="line-167"> EnvironmentEdgeManager.injectEdge(() -> 200L);</span>
+<span class="source-line-no">168</span><span id="line-168"></span>
+<span class="source-line-no">169</span><span id="line-169"> try {</span>
+<span class="source-line-no">170</span><span id="line-170"> // we queued for 20ms, leaving 80ms of timeout, which we divide by 2</span>
+<span class="source-line-no">171</span><span id="line-171"> assertEquals(200 + (100 - 20) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">172</span><span id="line-172"> // we queued for 80ms, leaving 20ms of timeout, which we divide by 2</span>
+<span class="source-line-no">173</span><span id="line-173"> assertEquals(200 + (100 - 80) / 2, services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">174</span><span id="line-174"> // we queued for 99ms of 100ms timeout, leaving only 1ms. we fall back to default minimum</span>
+<span class="source-line-no">175</span><span id="line-175"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
+<span class="source-line-no">176</span><span id="line-176"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">177</span><span id="line-177"> // lastly, we queue for 175ms of 100ms timeout. this should be very rare since we drop</span>
+<span class="source-line-no">178</span><span id="line-178"> // timed out calls in the queue. in this case we still fallback on default minimum for now.</span>
+<span class="source-line-no">179</span><span id="line-179"> assertEquals(200 + DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA,</span>
+<span class="source-line-no">180</span><span id="line-180"> services.getTimeLimit(mockRpcCall, mockController, true));</span>
+<span class="source-line-no">181</span><span id="line-181"> } finally {</span>
+<span class="source-line-no">182</span><span id="line-182"> EnvironmentEdgeManager.reset();</span>
+<span class="source-line-no">183</span><span id="line-183"> }</span>
+<span class="source-line-no">184</span><span id="line-184"></span>
+<span class="source-line-no">185</span><span id="line-185"> }</span>
+<span class="source-line-no">186</span><span id="line-186"></span>
+<span class="source-line-no">187</span><span id="line-187"> static void createTestTable(TableName name, byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
+<span class="source-line-no">188</span><span id="line-188"> byte[] cellValue) throws IOException {</span>
+<span class="source-line-no">189</span><span id="line-189"> Table ht = TEST_UTIL.createTable(name, families);</span>
+<span class="source-line-no">190</span><span id="line-190"> List<Put> puts = createPuts(rows, families, qualifiers, cellValue);</span>
+<span class="source-line-no">191</span><span id="line-191"> ht.put(puts);</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">193</span><span id="line-193"></span>
+<span class="source-line-no">194</span><span id="line-194"> /**</span>
+<span class="source-line-no">195</span><span id="line-195"> * Make puts to put the input value into each combination of row, family, and qualifier</span>
+<span class="source-line-no">196</span><span id="line-196"> */</span>
+<span class="source-line-no">197</span><span id="line-197"> static ArrayList<Put> createPuts(byte[][] rows, byte[][] families, byte[][] qualifiers,</span>
+<span class="source-line-no">198</span><span id="line-198"> byte[] value) throws IOException {</span>
+<span class="source-line-no">199</span><span id="line-199"> Put put;</span>
+<span class="source-line-no">200</span><span id="line-200"> ArrayList<Put> puts = new ArrayList<>();</span>
+<span class="source-line-no">201</span><span id="line-201"></span>
+<span class="source-line-no">202</span><span id="line-202"> for (int row = 0; row < rows.length; row++) {</span>
+<span class="source-line-no">203</span><span id="line-203"> put = new Put(rows[row]);</span>
+<span class="source-line-no">204</span><span id="line-204"> for (int fam = 0; fam < families.length; fam++) {</span>
+<span class="source-line-no">205</span><span id="line-205"> for (int qual = 0; qual < qualifiers.length; qual++) {</span>
+<span class="source-line-no">206</span><span id="line-206"> KeyValue kv = new KeyValue(rows[row], families[fam], qualifiers[qual], qual, value);</span>
+<span class="source-line-no">207</span><span id="line-207"> put.add(kv);</span>
+<span class="source-line-no">208</span><span id="line-208"> }</span>
+<span class="source-line-no">209</span><span id="line-209"> }</span>
+<span class="source-line-no">210</span><span id="line-210"> puts.add(put);</span>
+<span class="source-line-no">211</span><span id="line-211"> }</span>
+<span class="source-line-no">212</span><span id="line-212"></span>
+<span class="source-line-no">213</span><span id="line-213"> return puts;</span>
+<span class="source-line-no">214</span><span id="line-214"> }</span>
+<span class="source-line-no">215</span><span id="line-215"></span>
+<span class="source-line-no">216</span><span id="line-216"> @AfterAll</span>
+<span class="source-line-no">217</span><span id="line-217"> public static void tearDownAfterClass() throws Exception {</span>
+<span class="source-line-no">218</span><span id="line-218"> Closeables.close(CONN, true);</span>
+<span class="source-line-no">219</span><span id="line-219"> TEST_UTIL.shutdownMiniCluster();</span>
<span class="source-line-no">220</span><span id="line-220"> }</span>
<span class="source-line-no">221</span><span id="line-221"></span>
-<span class="source-line-no">222</span><span id="line-222"> @AfterClass</span>
-<span class="source-line-no">223</span><span id="line-223"> public static void tearDownAfterClass() throws Exception {</span>
-<span class="source-line-no">224</span><span id="line-224"> Closeables.close(CONN, true);</span>
-<span class="source-line-no">225</span><span id="line-225"> TEST_UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">226</span><span id="line-226"> }</span>
-<span class="source-line-no">227</span><span id="line-227"></span>
-<span class="source-line-no">228</span><span id="line-228"> @Before</span>
-<span class="source-line-no">229</span><span id="line-229"> public void setupBeforeTest() throws Exception {</span>
-<span class="source-line-no">230</span><span id="line-230"> disableSleeping();</span>
-<span class="source-line-no">231</span><span id="line-231"> }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233"> @After</span>
-<span class="source-line-no">234</span><span id="line-234"> public void teardownAfterTest() throws Exception {</span>
-<span class="source-line-no">235</span><span id="line-235"> disableSleeping();</span>
-<span class="source-line-no">236</span><span id="line-236"> }</span>
-<span class="source-line-no">237</span><span id="line-237"></span>
-<span class="source-line-no">238</span><span id="line-238"> /**</span>
-<span class="source-line-no">239</span><span id="line-239"> * Run the test callable when heartbeats are enabled/disabled. We expect all tests to only pass</span>
-<span class="source-line-no">240</span><span id="line-240"> * when heartbeat messages are enabled (otherwise the test is pointless). When heartbeats are</span>
-<span class="source-line-no">241</span><span id="line-241"> * disabled, the test should throw an exception.</span>
-<span class="source-line-no">242</span><span id="line-242"> */</span>
-<span class="source-line-no">243</span><span id="line-243"> private void testImportanceOfHeartbeats(Callable<Void> testCallable) throws InterruptedException {</span>
-<span class="source-line-no">244</span><span id="line-244"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
-<span class="source-line-no">245</span><span id="line-245"></span>
-<span class="source-line-no">246</span><span id="line-246"> try {</span>
-<span class="source-line-no">247</span><span id="line-247"> testCallable.call();</span>
-<span class="source-line-no">248</span><span id="line-248"> } catch (Exception e) {</span>
-<span class="source-line-no">249</span><span id="line-249"> fail("Heartbeat messages are enabled, exceptions should NOT be thrown. Exception trace:"</span>
-<span class="source-line-no">250</span><span id="line-250"> + ExceptionUtils.getStackTrace(e));</span>
-<span class="source-line-no">251</span><span id="line-251"> }</span>
-<span class="source-line-no">252</span><span id="line-252"></span>
-<span class="source-line-no">253</span><span id="line-253"> HeartbeatRPCServices.heartbeatsEnabled = false;</span>
-<span class="source-line-no">254</span><span id="line-254"> try {</span>
-<span class="source-line-no">255</span><span id="line-255"> testCallable.call();</span>
-<span class="source-line-no">256</span><span id="line-256"> } catch (Exception e) {</span>
-<span class="source-line-no">257</span><span id="line-257"> return;</span>
-<span class="source-line-no">258</span><span id="line-258"> } finally {</span>
-<span class="source-line-no">259</span><span id="line-259"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
-<span class="source-line-no">260</span><span id="line-260"> }</span>
-<span class="source-line-no">261</span><span id="line-261"> fail("Heartbeats messages are disabled, an exception should be thrown. If an exception "</span>
-<span class="source-line-no">262</span><span id="line-262"> + " is not thrown, the test case is not testing the importance of heartbeat messages");</span>
-<span class="source-line-no">263</span><span id="line-263"> }</span>
-<span class="source-line-no">264</span><span id="line-264"></span>
-<span class="source-line-no">265</span><span id="line-265"> /**</span>
-<span class="source-line-no">266</span><span id="line-266"> * Test the case that the time limit for the scan is reached after each full row of cells is</span>
-<span class="source-line-no">267</span><span id="line-267"> * fetched.</span>
-<span class="source-line-no">268</span><span id="line-268"> */</span>
-<span class="source-line-no">269</span><span id="line-269"> @Test</span>
-<span class="source-line-no">270</span><span id="line-270"> public void testHeartbeatBetweenRows() throws Exception {</span>
-<span class="source-line-no">271</span><span id="line-271"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">272</span><span id="line-272"></span>
-<span class="source-line-no">273</span><span id="line-273"> @Override</span>
-<span class="source-line-no">274</span><span id="line-274"> public Void call() throws Exception {</span>
-<span class="source-line-no">275</span><span id="line-275"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
-<span class="source-line-no">276</span><span id="line-276"> // the case where a scan stops on the server side due to a time limit</span>
-<span class="source-line-no">277</span><span id="line-277"> Scan scan = new Scan();</span>
-<span class="source-line-no">278</span><span id="line-278"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">279</span><span id="line-279"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">222</span><span id="line-222"> @BeforeEach</span>
+<span class="source-line-no">223</span><span id="line-223"> public void setupBeforeTest() throws Exception {</span>
+<span class="source-line-no">224</span><span id="line-224"> disableSleeping();</span>
+<span class="source-line-no">225</span><span id="line-225"> }</span>
+<span class="source-line-no">226</span><span id="line-226"></span>
+<span class="source-line-no">227</span><span id="line-227"> @AfterEach</span>
+<span class="source-line-no">228</span><span id="line-228"> public void teardownAfterTest() throws Exception {</span>
+<span class="source-line-no">229</span><span id="line-229"> disableSleeping();</span>
+<span class="source-line-no">230</span><span id="line-230"> }</span>
+<span class="source-line-no">231</span><span id="line-231"></span>
+<span class="source-line-no">232</span><span id="line-232"> /**</span>
+<span class="source-line-no">233</span><span id="line-233"> * Run the test callable when heartbeats are enabled/disabled. We expect all tests to only pass</span>
+<span class="source-line-no">234</span><span id="line-234"> * when heartbeat messages are enabled (otherwise the test is pointless). When heartbeats are</span>
+<span class="source-line-no">235</span><span id="line-235"> * disabled, the test should throw an exception.</span>
+<span class="source-line-no">236</span><span id="line-236"> */</span>
+<span class="source-line-no">237</span><span id="line-237"> private void testImportanceOfHeartbeats(Callable<Void> testCallable) throws InterruptedException {</span>
+<span class="source-line-no">238</span><span id="line-238"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
+<span class="source-line-no">239</span><span id="line-239"></span>
+<span class="source-line-no">240</span><span id="line-240"> try {</span>
+<span class="source-line-no">241</span><span id="line-241"> testCallable.call();</span>
+<span class="source-line-no">242</span><span id="line-242"> } catch (Exception e) {</span>
+<span class="source-line-no">243</span><span id="line-243"> fail("Heartbeat messages are enabled, exceptions should NOT be thrown. Exception trace:"</span>
+<span class="source-line-no">244</span><span id="line-244"> + ExceptionUtils.getStackTrace(e));</span>
+<span class="source-line-no">245</span><span id="line-245"> }</span>
+<span class="source-line-no">246</span><span id="line-246"></span>
+<span class="source-line-no">247</span><span id="line-247"> HeartbeatRPCServices.heartbeatsEnabled = false;</span>
+<span class="source-line-no">248</span><span id="line-248"> try {</span>
+<span class="source-line-no">249</span><span id="line-249"> testCallable.call();</span>
+<span class="source-line-no">250</span><span id="line-250"> } catch (Exception e) {</span>
+<span class="source-line-no">251</span><span id="line-251"> return;</span>
+<span class="source-line-no">252</span><span id="line-252"> } finally {</span>
+<span class="source-line-no">253</span><span id="line-253"> HeartbeatRPCServices.heartbeatsEnabled = true;</span>
+<span class="source-line-no">254</span><span id="line-254"> }</span>
+<span class="source-line-no">255</span><span id="line-255"> fail("Heartbeats messages are disabled, an exception should be thrown. If an exception "</span>
+<span class="source-line-no">256</span><span id="line-256"> + " is not thrown, the test case is not testing the importance of heartbeat messages");</span>
+<span class="source-line-no">257</span><span id="line-257"> }</span>
+<span class="source-line-no">258</span><span id="line-258"></span>
+<span class="source-line-no">259</span><span id="line-259"> /**</span>
+<span class="source-line-no">260</span><span id="line-260"> * Test the case that the time limit for the scan is reached after each full row of cells is</span>
+<span class="source-line-no">261</span><span id="line-261"> * fetched.</span>
+<span class="source-line-no">262</span><span id="line-262"> */</span>
+<span class="source-line-no">263</span><span id="line-263"> @Test</span>
+<span class="source-line-no">264</span><span id="line-264"> public void testHeartbeatBetweenRows() throws Exception {</span>
+<span class="source-line-no">265</span><span id="line-265"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">266</span><span id="line-266"></span>
+<span class="source-line-no">267</span><span id="line-267"> @Override</span>
+<span class="source-line-no">268</span><span id="line-268"> public Void call() throws Exception {</span>
+<span class="source-line-no">269</span><span id="line-269"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
+<span class="source-line-no">270</span><span id="line-270"> // the case where a scan stops on the server side due to a time limit</span>
+<span class="source-line-no">271</span><span id="line-271"> Scan scan = new Scan();</span>
+<span class="source-line-no">272</span><span id="line-272"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">273</span><span id="line-273"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">274</span><span id="line-274"></span>
+<span class="source-line-no">275</span><span id="line-275"> testEquivalenceOfScanWithHeartbeats(scan, DEFAULT_ROW_SLEEP_TIME, -1, false);</span>
+<span class="source-line-no">276</span><span id="line-276"> return null;</span>
+<span class="source-line-no">277</span><span id="line-277"> }</span>
+<span class="source-line-no">278</span><span id="line-278"> });</span>
+<span class="source-line-no">279</span><span id="line-279"> }</span>
<span class="source-line-no">280</span><span id="line-280"></span>
-<span class="source-line-no">281</span><span id="line-281"> testEquivalenceOfScanWithHeartbeats(scan, DEFAULT_ROW_SLEEP_TIME, -1, false);</span>
-<span class="source-line-no">282</span><span id="line-282"> return null;</span>
-<span class="source-line-no">283</span><span id="line-283"> }</span>
-<span class="source-line-no">284</span><span id="line-284"> });</span>
-<span class="source-line-no">285</span><span id="line-285"> }</span>
-<span class="source-line-no">286</span><span id="line-286"></span>
-<span class="source-line-no">287</span><span id="line-287"> /**</span>
-<span class="source-line-no">288</span><span id="line-288"> * Test the case that the time limit for scans is reached in between column families</span>
-<span class="source-line-no">289</span><span id="line-289"> */</span>
-<span class="source-line-no">290</span><span id="line-290"> @Test</span>
-<span class="source-line-no">291</span><span id="line-291"> public void testHeartbeatBetweenColumnFamilies() throws Exception {</span>
-<span class="source-line-no">292</span><span id="line-292"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">293</span><span id="line-293"> @Override</span>
-<span class="source-line-no">294</span><span id="line-294"> public Void call() throws Exception {</span>
-<span class="source-line-no">295</span><span id="line-295"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
-<span class="source-line-no">296</span><span id="line-296"> // the case where a scan stops on the server side due to a time limit</span>
-<span class="source-line-no">297</span><span id="line-297"> Scan baseScan = new Scan();</span>
-<span class="source-line-no">298</span><span id="line-298"> baseScan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">299</span><span id="line-299"> baseScan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">300</span><span id="line-300"></span>
-<span class="source-line-no">301</span><span id="line-301"> // Copy the scan before each test. When a scan object is used by a scanner, some of its</span>
-<span class="source-line-no">302</span><span id="line-302"> // fields may be changed such as start row</span>
-<span class="source-line-no">303</span><span id="line-303"> Scan scanCopy = new Scan(baseScan);</span>
-<span class="source-line-no">304</span><span id="line-304"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, false);</span>
-<span class="source-line-no">305</span><span id="line-305"> scanCopy = new Scan(baseScan);</span>
-<span class="source-line-no">306</span><span id="line-306"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, true);</span>
-<span class="source-line-no">307</span><span id="line-307"> return null;</span>
-<span class="source-line-no">308</span><span id="line-308"> }</span>
-<span class="source-line-no">309</span><span id="line-309"> });</span>
-<span class="source-line-no">310</span><span id="line-310"> }</span>
-<span class="source-line-no">311</span><span id="line-311"></span>
-<span class="source-line-no">312</span><span id="line-312"> public static class SparseCellFilter extends FilterBase {</span>
-<span class="source-line-no">313</span><span id="line-313"></span>
-<span class="source-line-no">314</span><span id="line-314"> @Override</span>
-<span class="source-line-no">315</span><span id="line-315"> public ReturnCode filterCell(final Cell v) throws IOException {</span>
-<span class="source-line-no">316</span><span id="line-316"> try {</span>
-<span class="source-line-no">317</span><span id="line-317"> Thread.sleep(CLIENT_TIMEOUT / 2 + 100);</span>
-<span class="source-line-no">318</span><span id="line-318"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">319</span><span id="line-319"> Thread.currentThread().interrupt();</span>
-<span class="source-line-no">320</span><span id="line-320"> }</span>
-<span class="source-line-no">321</span><span id="line-321"> return Bytes.equals(CellUtil.cloneRow(v), ROWS[NUM_ROWS - 1])</span>
-<span class="source-line-no">322</span><span id="line-322"> ? ReturnCode.INCLUDE</span>
-<span class="source-line-no">323</span><span id="line-323"> : ReturnCode.SKIP;</span>
-<span class="source-line-no">324</span><span id="line-324"> }</span>
-<span class="source-line-no">325</span><span id="line-325"></span>
-<span class="source-line-no">326</span><span id="line-326"> public static Filter parseFrom(final byte[] pbBytes) {</span>
-<span class="source-line-no">327</span><span id="line-327"> return new SparseCellFilter();</span>
-<span class="source-line-no">328</span><span id="line-328"> }</span>
-<span class="source-line-no">329</span><span id="line-329"> }</span>
-<span class="source-line-no">330</span><span id="line-330"></span>
-<span class="source-line-no">331</span><span id="line-331"> public static class SparseRowFilter extends FilterBase {</span>
-<span class="source-line-no">332</span><span id="line-332"></span>
-<span class="source-line-no">333</span><span id="line-333"> @Override</span>
-<span class="source-line-no">334</span><span id="line-334"> public boolean filterRowKey(Cell cell) throws IOException {</span>
-<span class="source-line-no">335</span><span id="line-335"> try {</span>
-<span class="source-line-no">336</span><span id="line-336"> Thread.sleep(CLIENT_TIMEOUT / 2 - 100);</span>
-<span class="source-line-no">337</span><span id="line-337"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">338</span><span id="line-338"> Thread.currentThread().interrupt();</span>
-<span class="source-line-no">339</span><span id="line-339"> }</span>
-<span class="source-line-no">340</span><span id="line-340"> return !Bytes.equals(CellUtil.cloneRow(cell), ROWS[NUM_ROWS - 1]);</span>
-<span class="source-line-no">341</span><span id="line-341"> }</span>
-<span class="source-line-no">342</span><span id="line-342"></span>
-<span class="source-line-no">343</span><span id="line-343"> public static Filter parseFrom(final byte[] pbBytes) {</span>
-<span class="source-line-no">344</span><span id="line-344"> return new SparseRowFilter();</span>
-<span class="source-line-no">345</span><span id="line-345"> }</span>
-<span class="source-line-no">346</span><span id="line-346"> }</span>
-<span class="source-line-no">347</span><span id="line-347"></span>
-<span class="source-line-no">348</span><span id="line-348"> /**</span>
-<span class="source-line-no">349</span><span id="line-349"> * Test the case that there is a filter which filters most of cells</span>
-<span class="source-line-no">350</span><span id="line-350"> */</span>
-<span class="source-line-no">351</span><span id="line-351"> @Test</span>
-<span class="source-line-no">352</span><span id="line-352"> public void testHeartbeatWithSparseCellFilter() throws Exception {</span>
-<span class="source-line-no">353</span><span id="line-353"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">354</span><span id="line-354"> @Override</span>
-<span class="source-line-no">355</span><span id="line-355"> public Void call() throws Exception {</span>
-<span class="source-line-no">356</span><span id="line-356"> Scan scan = new Scan();</span>
-<span class="source-line-no">357</span><span id="line-357"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">358</span><span id="line-358"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">359</span><span id="line-359"> scan.setFilter(new SparseCellFilter());</span>
-<span class="source-line-no">360</span><span id="line-360"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">361</span><span id="line-361"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">362</span><span id="line-362"> int num = 0;</span>
-<span class="source-line-no">363</span><span id="line-363"> while (scanner.next() != null) {</span>
-<span class="source-line-no">364</span><span id="line-364"> num++;</span>
-<span class="source-line-no">365</span><span id="line-365"> }</span>
-<span class="source-line-no">366</span><span id="line-366"> assertEquals(1, num);</span>
-<span class="source-line-no">367</span><span id="line-367"> }</span>
-<span class="source-line-no">368</span><span id="line-368"></span>
-<span class="source-line-no">369</span><span id="line-369"> scan = new Scan();</span>
-<span class="source-line-no">370</span><span id="line-370"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">371</span><span id="line-371"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">372</span><span id="line-372"> scan.setFilter(new SparseCellFilter());</span>
-<span class="source-line-no">373</span><span id="line-373"> scan.setAllowPartialResults(true);</span>
-<span class="source-line-no">374</span><span id="line-374"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">375</span><span id="line-375"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">376</span><span id="line-376"> int num = 0;</span>
-<span class="source-line-no">377</span><span id="line-377"> while (scanner.next() != null) {</span>
-<span class="source-line-no">378</span><span id="line-378"> num++;</span>
-<span class="source-line-no">379</span><span id="line-379"> }</span>
-<span class="source-line-no">380</span><span id="line-380"> assertEquals(NUM_FAMILIES * NUM_QUALIFIERS, num);</span>
-<span class="source-line-no">381</span><span id="line-381"> }</span>
-<span class="source-line-no">382</span><span id="line-382"></span>
-<span class="source-line-no">383</span><span id="line-383"> return null;</span>
-<span class="source-line-no">384</span><span id="line-384"> }</span>
-<span class="source-line-no">385</span><span id="line-385"> });</span>
-<span class="source-line-no">386</span><span id="line-386"> }</span>
-<span class="source-line-no">387</span><span id="line-387"></span>
-<span class="source-line-no">388</span><span id="line-388"> /**</span>
-<span class="source-line-no">389</span><span id="line-389"> * Test the case that there is a filter which filters most of rows</span>
-<span class="source-line-no">390</span><span id="line-390"> */</span>
-<span class="source-line-no">391</span><span id="line-391"> @Test</span>
-<span class="source-line-no">392</span><span id="line-392"> public void testHeartbeatWithSparseRowFilter() throws Exception {</span>
-<span class="source-line-no">393</span><span id="line-393"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
-<span class="source-line-no">394</span><span id="line-394"> @Override</span>
-<span class="source-line-no">395</span><span id="line-395"> public Void call() throws Exception {</span>
-<span class="source-line-no">396</span><span id="line-396"> Scan scan = new Scan();</span>
-<span class="source-line-no">397</span><span id="line-397"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
-<span class="source-line-no">398</span><span id="line-398"> scan.setCaching(Integer.MAX_VALUE);</span>
-<span class="source-line-no">399</span><span id="line-399"> scan.setFilter(new SparseRowFilter());</span>
-<span class="source-line-no">400</span><span id="line-400"> try (ScanPerNextResultScanner scanner =</span>
-<span class="source-line-no">401</span><span id="line-401"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
-<span class="source-line-no">402</span><span id="line-402"> int num = 0;</span>
-<span class="source-line-no">403</span><span id="line-403"> while (scanner.next() != null) {</span>
-<span class="source-line-no">404</span><span id="line-404"> num++;</span>
-<span class="source-line-no">405</span><span id="line-405"> }</span>
-<span class="source-line-no">406</span><span id="line-406"> assertEquals(1, num);</span>
-<span class="source-line-no">407</span><span id="line-407"> }</span>
-<span class="source-line-no">408</span><span id="line-408"></span>
-<span class="source-line-no">409</span><span id="line-409"> return null;</span>
-<span class="source-line-no">410</span><span id="line-410"> }</span>
-<span class="source-line-no">411</span><span id="line-411"> });</span>
-<span class="source-line-no">412</span><span id="line-412"> }</span>
-<span class="source-line-no">413</span><span id="line-413"></span>
-<span class="source-line-no">414</span><span id="line-414"> /**</span>
-<span class="source-line-no">415</span><span id="line-415"> * Test the equivalence of a scan versus the same scan executed when heartbeat messages are</span>
-<span class="source-line-no">416</span><span id="line-416"> * necessary</span>
-<span class="source-line-no">417</span><span id="line-417"> * @param scan The scan configuration being tested</span>
-<span class="source-line-no">418</span><span id="line-418"> * @param rowSleepTime The time to sleep between fetches of row cells</span>
-<span class="source-line-no">419</span><span id="line-419"> * @param cfSleepTime The time to sleep between fetches of column family cells</span>
-<span class="source-line-no">420</span><span id="line-420"> * @param sleepBeforeCf set to true when column family sleeps should occur before the cells for</span>
-<span class="source-line-no">421</span><span id="line-421"> * that column family are fetched</span>
-<span class="source-line-no">422</span><span id="line-422"> */</span>
-<span class="source-line-no">423</span><span id="line-423"> private void testEquivalenceOfScanWithHeartbeats(final Scan scan, int rowSleepTime,</span>
-<span class="source-line-no">424</span><span id="line-424"> int cfSleepTime, boolean sleepBeforeCf) throws Exception {</span>
-<span class="source-line-no">425</span><span id="line-425"> disableSleeping();</span>
-<span class="source-line-no">426</span><span id="line-426"> AsyncTable<AdvancedScanResultConsumer> table = CONN.getTable(TABLE_NAME);</span>
-<span class="source-line-no">427</span><span id="line-427"> final ResultScanner scanner = new ScanPerNextResultScanner(table, scan);</span>
-<span class="source-line-no">428</span><span id="line-428"> final ResultScanner scannerWithHeartbeats = new ScanPerNextResultScanner(table, scan);</span>
-<span class="source-line-no">429</span><span id="line-429"></span>
-<span class="source-line-no">430</span><span id="line-430"> Result r1 = null;</span>
-<span class="source-line-no">431</span><span id="line-431"> Result r2 = null;</span>
+<span class="source-line-no">281</span><span id="line-281"> /**</span>
+<span class="source-line-no">282</span><span id="line-282"> * Test the case that the time limit for scans is reached in between column families</span>
+<span class="source-line-no">283</span><span id="line-283"> */</span>
+<span class="source-line-no">284</span><span id="line-284"> @Test</span>
+<span class="source-line-no">285</span><span id="line-285"> public void testHeartbeatBetweenColumnFamilies() throws Exception {</span>
+<span class="source-line-no">286</span><span id="line-286"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">287</span><span id="line-287"> @Override</span>
+<span class="source-line-no">288</span><span id="line-288"> public Void call() throws Exception {</span>
+<span class="source-line-no">289</span><span id="line-289"> // Configure the scan so that it can read the entire table in a single RPC. We want to test</span>
+<span class="source-line-no">290</span><span id="line-290"> // the case where a scan stops on the server side due to a time limit</span>
+<span class="source-line-no">291</span><span id="line-291"> Scan baseScan = new Scan();</span>
+<span class="source-line-no">292</span><span id="line-292"> baseScan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">293</span><span id="line-293"> baseScan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">294</span><span id="line-294"></span>
+<span class="source-line-no">295</span><span id="line-295"> // Copy the scan before each test. When a scan object is used by a scanner, some of its</span>
+<span class="source-line-no">296</span><span id="line-296"> // fields may be changed such as start row</span>
+<span class="source-line-no">297</span><span id="line-297"> Scan scanCopy = new Scan(baseScan);</span>
+<span class="source-line-no">298</span><span id="line-298"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, false);</span>
+<span class="source-line-no">299</span><span id="line-299"> scanCopy = new Scan(baseScan);</span>
+<span class="source-line-no">300</span><span id="line-300"> testEquivalenceOfScanWithHeartbeats(scanCopy, -1, DEFAULT_CF_SLEEP_TIME, true);</span>
+<span class="source-line-no">301</span><span id="line-301"> return null;</span>
+<span class="source-line-no">302</span><span id="line-302"> }</span>
+<span class="source-line-no">303</span><span id="line-303"> });</span>
+<span class="source-line-no">304</span><span id="line-304"> }</span>
+<span class="source-line-no">305</span><span id="line-305"></span>
+<span class="source-line-no">306</span><span id="line-306"> public static class SparseCellFilter extends FilterBase {</span>
+<span class="source-line-no">307</span><span id="line-307"></span>
+<span class="source-line-no">308</span><span id="line-308"> @Override</span>
+<span class="source-line-no">309</span><span id="line-309"> public ReturnCode filterCell(final Cell v) throws IOException {</span>
+<span class="source-line-no">310</span><span id="line-310"> try {</span>
+<span class="source-line-no">311</span><span id="line-311"> Thread.sleep(CLIENT_TIMEOUT / 2 + 100);</span>
+<span class="source-line-no">312</span><span id="line-312"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">313</span><span id="line-313"> Thread.currentThread().interrupt();</span>
+<span class="source-line-no">314</span><span id="line-314"> }</span>
+<span class="source-line-no">315</span><span id="line-315"> return Bytes.equals(CellUtil.cloneRow(v), ROWS[NUM_ROWS - 1])</span>
+<span class="source-line-no">316</span><span id="line-316"> ? ReturnCode.INCLUDE</span>
+<span class="source-line-no">317</span><span id="line-317"> : ReturnCode.SKIP;</span>
+<span class="source-line-no">318</span><span id="line-318"> }</span>
+<span class="source-line-no">319</span><span id="line-319"></span>
+<span class="source-line-no">320</span><span id="line-320"> public static Filter parseFrom(final byte[] pbBytes) {</span>
+<span class="source-line-no">321</span><span id="line-321"> return new SparseCellFilter();</span>
+<span class="source-line-no">322</span><span id="line-322"> }</span>
+<span class="source-line-no">323</span><span id="line-323"> }</span>
+<span class="source-line-no">324</span><span id="line-324"></span>
+<span class="source-line-no">325</span><span id="line-325"> public static class SparseRowFilter extends FilterBase {</span>
+<span class="source-line-no">326</span><span id="line-326"></span>
+<span class="source-line-no">327</span><span id="line-327"> @Override</span>
+<span class="source-line-no">328</span><span id="line-328"> public boolean filterRowKey(Cell cell) throws IOException {</span>
+<span class="source-line-no">329</span><span id="line-329"> try {</span>
+<span class="source-line-no">330</span><span id="line-330"> Thread.sleep(CLIENT_TIMEOUT / 2 - 100);</span>
+<span class="source-line-no">331</span><span id="line-331"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">332</span><span id="line-332"> Thread.currentThread().interrupt();</span>
+<span class="source-line-no">333</span><span id="line-333"> }</span>
+<span class="source-line-no">334</span><span id="line-334"> return !Bytes.equals(CellUtil.cloneRow(cell), ROWS[NUM_ROWS - 1]);</span>
+<span class="source-line-no">335</span><span id="line-335"> }</span>
+<span class="source-line-no">336</span><span id="line-336"></span>
+<span class="source-line-no">337</span><span id="line-337"> public static Filter parseFrom(final byte[] pbBytes) {</span>
+<span class="source-line-no">338</span><span id="line-338"> return new SparseRowFilter();</span>
+<span class="source-line-no">339</span><span id="line-339"> }</span>
+<span class="source-line-no">340</span><span id="line-340"> }</span>
+<span class="source-line-no">341</span><span id="line-341"></span>
+<span class="source-line-no">342</span><span id="line-342"> /**</span>
+<span class="source-line-no">343</span><span id="line-343"> * Test the case that there is a filter which filters most of cells</span>
+<span class="source-line-no">344</span><span id="line-344"> */</span>
+<span class="source-line-no">345</span><span id="line-345"> @Test</span>
+<span class="source-line-no">346</span><span id="line-346"> public void testHeartbeatWithSparseCellFilter() throws Exception {</span>
+<span class="source-line-no">347</span><span id="line-347"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">348</span><span id="line-348"> @Override</span>
+<span class="source-line-no">349</span><span id="line-349"> public Void call() throws Exception {</span>
+<span class="source-line-no">350</span><span id="line-350"> Scan scan = new Scan();</span>
+<span class="source-line-no">351</span><span id="line-351"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">352</span><span id="line-352"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">353</span><span id="line-353"> scan.setFilter(new SparseCellFilter());</span>
+<span class="source-line-no">354</span><span id="line-354"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">355</span><span id="line-355"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">356</span><span id="line-356"> int num = 0;</span>
+<span class="source-line-no">357</span><span id="line-357"> while (scanner.next() != null) {</span>
+<span class="source-line-no">358</span><span id="line-358"> num++;</span>
+<span class="source-line-no">359</span><span id="line-359"> }</span>
+<span class="source-line-no">360</span><span id="line-360"> assertEquals(1, num);</span>
+<span class="source-line-no">361</span><span id="line-361"> }</span>
+<span class="source-line-no">362</span><span id="line-362"></span>
+<span class="source-line-no">363</span><span id="line-363"> scan = new Scan();</span>
+<span class="source-line-no">364</span><span id="line-364"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">365</span><span id="line-365"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">366</span><span id="line-366"> scan.setFilter(new SparseCellFilter());</span>
+<span class="source-line-no">367</span><span id="line-367"> scan.setAllowPartialResults(true);</span>
+<span class="source-line-no">368</span><span id="line-368"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">369</span><span id="line-369"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">370</span><span id="line-370"> int num = 0;</span>
+<span class="source-line-no">371</span><span id="line-371"> while (scanner.next() != null) {</span>
+<span class="source-line-no">372</span><span id="line-372"> num++;</span>
+<span class="source-line-no">373</span><span id="line-373"> }</span>
+<span class="source-line-no">374</span><span id="line-374"> assertEquals(NUM_FAMILIES * NUM_QUALIFIERS, num);</span>
+<span class="source-line-no">375</span><span id="line-375"> }</span>
+<span class="source-line-no">376</span><span id="line-376"></span>
+<span class="source-line-no">377</span><span id="line-377"> return null;</span>
+<span class="source-line-no">378</span><span id="line-378"> }</span>
+<span class="source-line-no">379</span><span id="line-379"> });</span>
+<span class="source-line-no">380</span><span id="line-380"> }</span>
+<span class="source-line-no">381</span><span id="line-381"></span>
+<span class="source-line-no">382</span><span id="line-382"> /**</span>
+<span class="source-line-no">383</span><span id="line-383"> * Test the case that there is a filter which filters most of rows</span>
+<span class="source-line-no">384</span><span id="line-384"> */</span>
+<span class="source-line-no">385</span><span id="line-385"> @Test</span>
+<span class="source-line-no">386</span><span id="line-386"> public void testHeartbeatWithSparseRowFilter() throws Exception {</span>
+<span class="source-line-no">387</span><span id="line-387"> testImportanceOfHeartbeats(new Callable<Void>() {</span>
+<span class="source-line-no">388</span><span id="line-388"> @Override</span>
+<span class="source-line-no">389</span><span id="line-389"> public Void call() throws Exception {</span>
+<span class="source-line-no">390</span><span id="line-390"> Scan scan = new Scan();</span>
+<span class="source-line-no">391</span><span id="line-391"> scan.setMaxResultSize(Long.MAX_VALUE);</span>
+<span class="source-line-no">392</span><span id="line-392"> scan.setCaching(Integer.MAX_VALUE);</span>
+<span class="source-line-no">393</span><span id="line-393"> scan.setFilter(new SparseRowFilter());</span>
+<span class="source-line-no">394</span><span id="line-394"> try (ScanPerNextResultScanner scanner =</span>
+<span class="source-line-no">395</span><span id="line-395"> new ScanPerNextResultScanner(CONN.getTable(TABLE_NAME), scan)) {</span>
+<span class="source-line-no">396</span><span id="line-396"> int num = 0;</span>
+<span class="source-line-no">397</span><span id="line-397"> while (scanner.next() != null) {</span>
+<span class="source-line-no">398</span><span id="line-398"> num++;</span>
+<span class="source-line-no">399</span><span id="line-399"> }</span>
+<span class="source-line-no">400</span><span id="line-400"> assertEquals(1, num);</span>
+<span class="source-line-no">401</span><span id="line-401"> }</span>
+<span class="source-line-no">402</span><span id="line-402"></span>
+<span class="source-line-no">403</span><span id="line-403"> return null;</span>
+<span class="source-line-no">404</span><span id="line-404"> }</span>
+<span class="source-line-no">405</span><span id="line-405"> });</span>
+<span class="source-line-no">406</span><span id="line-406"> }</span>
+<span class="source-line-no">407</span><span id="line-407"></span>
+<span class="source-line-no">408</span><span id="line-408"> /**</span>
+<span class="source-line-no">409</span><span id="line-409"> * Test the equivalence of a scan versus the same scan executed when heartbeat messages are</span>
+<span class="source-line-no">410</span><span id="line-410"> * necessary</span>
+<span class="source-line-no">411</span><span id="line-411"> * @param scan The scan configuration being tested</span>
+<span class="source-line-no">412</span><span id="line-412"> * @param rowSleepTime The time to sleep between fetches of row cells</span>
+<span class="source-line-no">413</span><span id="line-413"> * @param cfSleepTime The time to sleep between fetches of column family cells</span>
+<span class="source-line-no">414</span><span id="line-414"> * @param sleepBeforeCf set to true when column family sleeps should occur before the cells for</span>
+<span class="source-line-no">415</span><span id="line-415"> * that column family are fetched</span>
+<span class="source-line-no">416</span><span id="line-416"> */</span>
+<span class="source-line-no">417</span><span id="line-417"> private void testEquivalenceOfScanWithHeartbeats(final Scan scan, int rowSleepTime,</span>
+<span class="source-line-no">418</span><span id="line-418"> int cfSleepTime, boolean sleepBeforeCf) throws Exception {</span>
+<span class="source-line-no">419</span><span id="line-419"> disableSleeping();</span>
+<span class="source-line-no">420</span><span id="line-420"> AsyncTable<AdvancedScanResultConsumer> table = CONN.getTable(TABLE_NAME);</span>
+<span class="source-line-no">421</span><span id="line-421"> final ResultScanner scanner = new ScanPerNextResultScanner(table, scan);</span>
+<span class="source-line-no">422</span><span id="line-422"> final ResultScanner scannerWithHeartbeats = new ScanPerNextResultScanner(table, scan);</span>
+<span class="source-line-no">423</span><span id="line-423"></span>
+<span class="source-line-no">424</span><span id="line-424"> Result r1 = null;</span>
+<span class="source-line-no">425</span><span id="line-425"> Result r2 = null;</span>
+<span class="source-line-no">426</span><span id="line-426"></span>
+<span class="source-line-no">427</span><span id="line-427"> while ((r1 = scanner.next()) != null) {</span>
+<span class="source-line-no">428</span><span id="line-428"> // Enforce the specified sleep conditions during calls to the heartbeat scanner</span>
+<span class="source-line-no">429</span><span id="line-429"> configureSleepTime(rowSleepTime, cfSleepTime, sleepBeforeCf);</span>
+<span class="source-line-no">430</span><span id="line-430"> r2 = scannerWithHeartbeats.next();</span>
+<span class="source-line-no">431</span><span id="line-431"> disableSleeping();</span>
<span class="source-line-no">432</span><span id="line-432"></span>
-<span class="source-line-no">433</span><span id="line-433"> while ((r1 = scanner.next()) != null) {</span>
-<span class="source-line-no">434</span><span id="line-434"> // Enforce the specified sleep conditions during calls to the heartbeat scanner</span>
-<span class="source-line-no">435</span><span id="line-435"> configureSleepTime(rowSleepTime, cfSleepTime, sleepBeforeCf);</span>
-<span class="source-line-no">436</span><span id="line-436"> r2 = scannerWithHeartbeats.next();</span>
-<span class="source-line-no">437</span><span id="line-437"> disableSleeping();</span>
-<span class="source-line-no">438</span><span id="line-438"></span>
-<span class="source-line-no">439</span><span id="line-439"> assertTrue(r2 != null);</span>
-<span class="source-line-no">440</span><span id="line-440"> try {</span>
-<span class="source-line-no">441</span><span id="line-441"> Result.compareResults(r1, r2);</span>
-<span class="source-line-no">442</span><span id="line-442"> } catch (Exception e) {</span>
-<span class="source-line-no">443</span><span id="line-443"> fail(e.getMessage());</span>
-<span class="source-line-no">444</span><span id="line-444"> }</span>
-<span class="source-line-no">445</span><span id="line-445"> }</span>
-<span class="source-line-no">446</span><span id="line-446"></span>
-<span class="source-line-no">447</span><span id="line-447"> assertTrue(scannerWithHeartbeats.next() == null);</span>
-<span class="source-line-no">448</span><span id="line-448"> scanner.close();</span>
-<span class="source-line-no">449</span><span id="line-449"> scannerWithHeartbeats.close();</span>
-<span class="source-line-no">450</span><span id="line-450"> }</span>
-<span class="source-line-no">451</span><span id="line-451"></span>
-<span class="source-line-no">452</span><span id="line-452"> /**</span>
-<span class="source-line-no">453</span><span id="line-453"> * Helper method for setting the time to sleep between rows and column families. If a sleep time</span>
-<span class="source-line-no">454</span><span id="line-454"> * is negative then that sleep will be disabled</span>
-<span class="source-line-no">455</span><span id="line-455"> */</span>
-<span class="source-line-no">456</span><span id="line-456"> private static void configureSleepTime(int rowSleepTime, int cfSleepTime, boolean sleepBeforeCf) {</span>
-<span class="source-line-no">457</span><span id="line-457"> HeartbeatHRegion.sleepBetweenRows = rowSleepTime > 0;</span>
-<span class="source-line-no">458</span><span id="line-458"> HeartbeatHRegion.rowSleepTime = rowSleepTime;</span>
-<span class="source-line-no">459</span><span id="line-459"></span>
-<span class="source-line-no">460</span><span id="line-460"> HeartbeatHRegion.sleepBetweenColumnFamilies = cfSleepTime > 0;</span>
-<span class="source-line-no">461</span><span id="line-461"> HeartbeatHRegion.columnFamilySleepTime = cfSleepTime;</span>
-<span class="source-line-no">462</span><span id="line-462"> HeartbeatHRegion.sleepBeforeColumnFamily = sleepBeforeCf;</span>
-<span class="source-line-no">463</span><span id="line-463"> }</span>
-<span class="source-line-no">464</span><span id="line-464"></span>
-<span class="source-line-no">465</span><span id="line-465"> /**</span>
-<span class="source-line-no">466</span><span id="line-466"> * Disable the sleeping mechanism server side.</span>
-<span class="source-line-no">467</span><span id="line-467"> */</span>
-<span class="source-line-no">468</span><span id="line-468"> private static void disableSleeping() {</span>
-<span class="source-line-no">469</span><span id="line-469"> HeartbeatHRegion.sleepBetweenRows = false;</span>
-<span class="source-line-no">470</span><span id="line-470"> HeartbeatHRegion.sleepBetweenColumnFamilies = false;</span>
-<span class="source-line-no">471</span><span id="line-471"> }</span>
-<span class="source-line-no">472</span><span id="line-472"></span>
-<span class="source-line-no">473</span><span id="line-473"> /**</span>
-<span class="source-line-no">474</span><span id="line-474"> * Custom HRegionServer instance that instantiates {@link HeartbeatRPCServices} in place of</span>
-<span class="source-line-no">475</span><span id="line-475"> * {@link RSRpcServices} to allow us to toggle support for heartbeat messages</span>
-<span class="source-line-no">476</span><span id="line-476"> */</span>
-<span class="source-line-no">477</span><span id="line-477"> private static class HeartbeatHRegionServer extends HRegionServer {</span>
-<span class="source-line-no">478</span><span id="line-478"> public HeartbeatHRegionServer(Configuration conf) throws IOException, InterruptedException {</span>
-<span class="source-line-no">479</span><span id="line-479"> super(conf);</span>
-<span class="source-line-no">480</span><span id="line-480"> }</span>
+<span class="source-line-no">433</span><span id="line-433"> assertTrue(r2 != null);</span>
+<span class="source-line-no">434</span><span id="line-434"> try {</span>
+<span class="source-line-no">435</span><span id="line-435"> Result.compareResults(r1, r2);</span>
+<span class="source-line-no">436</span><span id="line-436"> } catch (Exception e) {</span>
+<span class="source-line-no">437</span><span id="line-437"> fail(e.getMessage());</span>
+<span class="source-line-no">438</span><span id="line-438"> }</span>
+<span class="source-line-no">439</span><span id="line-439"> }</span>
+<span class="source-line-no">440</span><span id="line-440"></span>
+<span class="source-line-no">441</span><span id="line-441"> assertTrue(scannerWithHeartbeats.next() == null);</span>
+<span class="source-line-no">442</span><span id="line-442"> scanner.close();</span>
+<span class="source-line-no">443</span><span id="line-443"> scannerWithHeartbeats.close();</span>
+<span class="source-line-no">444</span><span id="line-444"> }</span>
+<span class="source-line-no">445</span><span id="line-445"></span>
+<span class="source-line-no">446</span><span id="line-446"> /**</span>
+<span class="source-line-no">447</span><span id="line-447"> * Helper method for setting the time to sleep between rows and column families. If a sleep time</span>
+<span class="source-line-no">448</span><span id="line-448"> * is negative then that sleep will be disabled</span>
+<span class="source-line-no">449</span><span id="line-449"> */</span>
+<span class="source-line-no">450</span><span id="line-450"> private static void configureSleepTime(int rowSleepTime, int cfSleepTime, boolean sleepBeforeCf) {</span>
+<span class="source-line-no">451</span><span id="line-451"> HeartbeatHRegion.sleepBetweenRows = rowSleepTime > 0;</span>
+<span class="source-line-no">452</span><span id="line-452"> HeartbeatHRegion.rowSleepTime = rowSleepTime;</span>
+<span class="source-line-no">453</span><span id="line-453"></span>
+<span class="source-line-no">454</span><span id="line-454"> HeartbeatHRegion.sleepBetweenColumnFamilies = cfSleepTime > 0;</span>
+<span class="source-line-no">455</span><span id="line-455"> HeartbeatHRegion.columnFamilySleepTime = cfSleepTime;</span>
+<span class="source-line-no">456</span><span id="line-456"> HeartbeatHRegion.sleepBeforeColumnFamily = sleepBeforeCf;</span>
+<span class="source-line-no">457</span><span id="line-457"> }</span>
+<span class="source-line-no">458</span><span id="line-458"></span>
+<span class="source-line-no">459</span><span id="line-459"> /**</span>
+<span class="source-line-no">460</span><span id="line-460"> * Disable the sleeping mechanism server side.</span>
+<span class="source-line-no">461</span><span id="line-461"> */</span>
+<span class="source-line-no">462</span><span id="line-462"> private static void disableSleeping() {</span>
+<span class="source-line-no">463</span><span id="line-463"> HeartbeatHRegion.sleepBetweenRows = false;</span>
+<span class="source-line-no">464</span><span id="line-464"> HeartbeatHRegion.sleepBetweenColumnFamilies = false;</span>
+<span class="source-line-no">465</span><span id="line-465"> }</span>
+<span class="source-line-no">466</span><span id="line-466"></span>
+<span class="source-line-no">467</span><span id="line-467"> /**</span>
+<span class="source-line-no">468</span><span id="line-468"> * Custom HRegionServer instance that instantiates {@link HeartbeatRPCServices} in place of</span>
+<span class="source-line-no">469</span><span id="line-469"> * {@link RSRpcServices} to allow us to toggle support for heartbeat messages</span>
+<span class="source-line-no">470</span><span id="line-470"> */</span>
+<span class="source-line-no">471</span><span id="line-471"> private static class HeartbeatHRegionServer extends HRegionServer {</span>
+<span class="source-line-no">472</span><span id="line-472"> public HeartbeatHRegionServer(Configuration conf) throws IOException, InterruptedException {</span>
+<span class="source-line-no">473</span><span id="line-473"> super(conf);</span>
+<span class="source-line-no">474</span><span id="line-474"> }</span>
+<span class="source-line-no">475</span><span id="line-475"></span>
+<span class="source-line-no">476</span><span id="line-476"> @Override</span>
+<span class="source-line-no">477</span><span id="line-477"> protected RSRpcServices createRpcServices() throws IOException {</span>
+<span class="source-line-no">478</span><span id="line-478"> return new HeartbeatRPCServices(this);</span>
+<span class="source-line-no">479</span><span id="line-479"> }</span>
+<span class="source-line-no">480</span><span id="line-480"> }</span>
<span class="source-line-no">481</span><span id="line-481"></span>
-<span class="source-line-no">482</span><span id="line-482"> @Override</span>
-<span class="source-line-no">483</span><span id="line-483"> protected RSRpcServices createRpcServices() throws IOException {</span>
-<span class="source-line-no">484</span><span id="line-484"> return new HeartbeatRPCServices(this);</span>
-<span class="source-line-no">485</span><span id="line-485"> }</span>
-<span class="source-line-no">486</span><span id="line-486"> }</span>
+<span class="source-line-no">482</span><span id="line-482"> /**</span>
+<span class="source-line-no">483</span><span id="line-483"> * Custom RSRpcServices instance that allows heartbeat support to be toggled</span>
+<span class="source-line-no">484</span><span id="line-484"> */</span>
+<span class="source-line-no">485</span><span id="line-485"> private static class HeartbeatRPCServices extends RSRpcServices {</span>
+<span class="source-line-no">486</span><span id="line-486"> private static volatile boolean heartbeatsEnabled = true;</span>
<span class="source-line-no">487</span><span id="line-487"></span>
-<span class="source-line-no">488</span><span id="line-488"> /**</span>
-<span class="source-line-no">489</span><span id="line-489"> * Custom RSRpcServices instance that allows heartbeat support to be toggled</span>
-<span class="source-line-no">490</span><span id="line-490"> */</span>
-<span class="source-line-no">491</span><span id="line-491"> private static class HeartbeatRPCServices extends RSRpcServices {</span>
-<span class="source-line-no">492</span><span id="line-492"> private static volatile boolean heartbeatsEnabled = true;</span>
-<span class="source-line-no">493</span><span id="line-493"></span>
-<span class="source-line-no">494</span><span id="line-494"> public HeartbeatRPCServices(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">495</span><span id="line-495"> super(rs);</span>
-<span class="source-line-no">496</span><span id="line-496"> }</span>
-<span class="source-line-no">497</span><span id="line-497"></span>
-<span class="source-line-no">498</span><span id="line-498"> @Override</span>
-<span class="source-line-no">499</span><span id="line-499"> public ScanResponse scan(RpcController controller, ScanRequest request)</span>
-<span class="source-line-no">500</span><span id="line-500"> throws ServiceException {</span>
-<span class="source-line-no">501</span><span id="line-501"> ScanRequest.Builder builder = ScanRequest.newBuilder(request);</span>
-<span class="source-line-no">502</span><span id="line-502"> builder.setClientHandlesHeartbeats(heartbeatsEnabled);</span>
-<span class="source-line-no">503</span><span id="line-503"> return super.scan(controller, builder.build());</span>
-<span class="source-line-no">504</span><span id="line-504"> }</span>
-<span class="source-line-no">505</span><span id="line-505"> }</span>
-<span class="source-line-no">506</span><span id="line-506"></span>
-<span class="source-line-no">507</span><span id="line-507"> /**</span>
-<span class="source-line-no">508</span><span id="line-508"> * Custom HRegion class that instantiates {@link RegionScanner}s with configurable sleep times</span>
-<span class="source-line-no">509</span><span id="line-509"> * between fetches of row Results and/or column family cells. Useful for emulating an instance</span>
-<span class="source-line-no">510</span><span id="line-510"> * where the server is taking a long time to process a client's scan request</span>
-<span class="source-line-no">511</span><span id="line-511"> */</span>
-<span class="source-line-no">512</span><span id="line-512"> private static class HeartbeatHRegion extends HRegion {</span>
-<span class="source-line-no">513</span><span id="line-513"> // Row sleeps occur AFTER each row worth of cells is retrieved.</span>
-<span class="source-line-no">514</span><span id="line-514"> private static volatile int rowSleepTime = DEFAULT_ROW_SLEEP_TIME;</span>
-<span class="source-line-no">515</span><span id="line-515"> private static volatile boolean sleepBetweenRows = false;</span>
-<span class="source-line-no">516</span><span id="line-516"></span>
-<span class="source-line-no">517</span><span id="line-517"> // The sleep for column families can be initiated before or after we fetch the cells for the</span>
-<span class="source-line-no">518</span><span id="line-518"> // column family. If the sleep occurs BEFORE then the time limits will be reached inside</span>
-<span class="source-line-no">519</span><span id="line-519"> // StoreScanner while we are fetching individual cells. If the sleep occurs AFTER then the time</span>
-<span class="source-line-no">520</span><span id="line-520"> // limit will be reached inside RegionScanner after all the cells for a column family have been</span>
-<span class="source-line-no">521</span><span id="line-521"> // retrieved.</span>
-<span class="source-line-no">522</span><span id="line-522"> private static volatile boolean sleepBeforeColumnFamily = false;</span>
-<span class="source-line-no">523</span><span id="line-523"> private static volatile int columnFamilySleepTime = DEFAULT_CF_SLEEP_TIME;</span>
-<span class="source-line-no">524</span><span id="line-524"> private static volatile boolean sleepBetweenColumnFamilies = false;</span>
-<span class="source-line-no">525</span><span id="line-525"></span>
-<span class="source-line-no">526</span><span id="line-526"> public HeartbeatHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam,</span>
-<span class="source-line-no">527</span><span id="line-527"> RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) {</span>
-<span class="source-line-no">528</span><span id="line-528"> super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices);</span>
-<span class="source-line-no">529</span><span id="line-529"> }</span>
-<span class="source-line-no">530</span><span id="line-530"></span>
-<span class="source-line-no">531</span><span id="line-531"> public HeartbeatHRegion(HRegionFileSystem fs, WAL wal, Configuration confParam,</span>
-<span class="source-line-no">532</span><span id="line-532"> TableDescriptor htd, RegionServerServices rsServices) {</span>
-<span class="source-line-no">533</span><span id="line-533"> super(fs, wal, confParam, htd, rsServices);</span>
+<span class="source-line-no">488</span><span id="line-488"> public HeartbeatRPCServices(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">489</span><span id="line-489"> super(rs);</span>
+<span class="source-line-no">490</span><span id="line-490"> }</span>
+<span class="source-line-no">491</span><span id="line-491"></span>
+<span class="source-line-no">492</span><span id="line-492"> @Override</span>
+<span class="source-line-no">493</span><span id="line-493"> public ScanResponse scan(RpcController controller, ScanRequest request)</span>
+<span class="source-line-no">494</span><span id="line-494"> throws ServiceException {</span>
+<span class="source-line-no">495</span><span id="line-495"> ScanRequest.Builder builder = ScanRequest.newBuilder(request);</span>
+<span class="source-line-no">496</span><span id="line-496"> builder.setClientHandlesHeartbeats(heartbeatsEnabled);</span>
+<span class="source-line-no">497</span><span id="line-497"> return super.scan(controller, builder.build());</span>
+<span class="source-line-no">498</span><span id="line-498"> }</span>
+<span class="source-line-no">499</span><span id="line-499"> }</span>
+<span class="source-line-no">500</span><span id="line-500"></span>
+<span class="source-line-no">501</span><span id="line-501"> /**</span>
+<span class="source-line-no">502</span><span id="line-502"> * Custom HRegion class that instantiates {@link RegionScanner}s with configurable sleep times</span>
+<span class="source-line-no">503</span><span id="line-503"> * between fetches of row Results and/or column family cells. Useful for emulating an instance</span>
+<span class="source-line-no">504</span><span id="line-504"> * where the server is taking a long time to process a client's scan request</span>
+<span class="source-line-no">505</span><span id="line-505"> */</span>
+<span class="source-line-no">506</span><span id="line-506"> private static class HeartbeatHRegion extends HRegion {</span>
+<span class="source-line-no">507</span><span id="line-507"> // Row sleeps occur AFTER each row worth of cells is retrieved.</span>
+<span class="source-line-no">508</span><span id="line-508"> private static volatile int rowSleepTime = DEFAULT_ROW_SLEEP_TIME;</span>
+<span class="source-line-no">509</span><span id="line-509"> private static volatile boolean sleepBetweenRows = false;</span>
+<span class="source-line-no">510</span><span id="line-510"></span>
+<span class="source-line-no">511</span><span id="line-511"> // The sleep for column families can be initiated before or after we fetch the cells for the</span>
+<span class="source-line-no">512</span><span id="line-512"> // column family. If the sleep occurs BEFORE then the time limits will be reached inside</span>
+<span class="source-line-no">513</span><span id="line-513"> // StoreScanner while we are fetching individual cells. If the sleep occurs AFTER then the time</span>
+<span class="source-line-no">514</span><span id="line-514"> // limit will be reached inside RegionScanner after all the cells for a column family have been</span>
+<span class="source-line-no">515</span><span id="line-515"> // retrieved.</span>
+<span class="source-line-no">516</span><span id="line-516"> private static volatile boolean sleepBeforeColumnFamily = false;</span>
+<span class="source-line-no">517</span><span id="line-517"> private static volatile int columnFamilySleepTime = DEFAULT_CF_SLEEP_TIME;</span>
+<span class="source-line-no">518</span><span id="line-518"> private static volatile boolean sleepBetweenColumnFamilies = false;</span>
+<span class="source-line-no">519</span><span id="line-519"></span>
+<span class="source-line-no">520</span><span id="line-520"> public HeartbeatHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam,</span>
+<span class="source-line-no">521</span><span id="line-521"> RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) {</span>
+<span class="source-line-no">522</span><span id="line-522"> super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices);</span>
+<span class="source-line-no">523</span><span id="line-523"> }</span>
+<span class="source-line-no">524</span><span id="line-524"></span>
+<span class="source-line-no">525</span><span id="line-525"> public HeartbeatHRegion(HRegionFileSystem fs, WAL wal, Configuration confParam,</span>
+<span class="source-line-no">526</span><span id="line-526"> TableDescriptor htd, RegionServerServices rsServices) {</span>
+<span class="source-line-no">527</span><span id="line-527"> super(fs, wal, confParam, htd, rsServices);</span>
+<span class="source-line-no">528</span><span id="line-528"> }</span>
+<span class="source-line-no">529</span><span id="line-529"></span>
+<span class="source-line-no">530</span><span id="line-530"> private static void columnFamilySleep() {</span>
+<span class="source-line-no">531</span><span id="line-531"> if (sleepBetweenColumnFamilies) {</span>
+<span class="source-line-no">532</span><span id="line-532"> Threads.sleepWithoutInterrupt(columnFamilySleepTime);</span>
+<span class="source-line-no">533</span><span id="line-533"> }</span>
<span class="source-line-no">534</span><span id="line-534"> }</span>
<span class="source-line-no">535</span><span id="line-535"></span>
-<span class="source-line-no">536</span><span id="line-536"> private static void columnFamilySleep() {</span>
-<span class="source-line-no">537</span><span id="line-537"> if (sleepBetweenColumnFamilies) {</span>
-<span class="source-line-no">538</span><span id="line-538"> Threads.sleepWithoutInterrupt(columnFamilySleepTime);</span>
+<span class="source-line-no">536</span><span id="line-536"> private static void rowSleep() {</span>
+<span class="source-line-no">537</span><span id="line-537"> if (sleepBetweenRows) {</span>
+<span class="source-line-no">538</span><span id="line-538"> Threads.sleepWithoutInterrupt(rowSleepTime);</span>
<span class="source-line-no">539</span><span id="line-539"> }</span>
<span class="source-line-no">540</span><span id="line-540"> }</span>
<span class="source-line-no">541</span><span id="line-541"></span>
-<span class="source-line-no">542</span><span id="line-542"> private static void rowSleep() {</span>
-<span class="source-line-no">543</span><span id="line-543"> if (sleepBetweenRows) {</span>
-<span class="source-line-no">544</span><span id="line-544"> Threads.sleepWithoutInterrupt(rowSleepTime);</span>
-<span class="source-line-no">545</span><span id="line-545"> }</span>
-<span class="source-line-no">546</span><span id="line-546"> }</span>
-<span class="source-line-no">547</span><span id="line-547"></span>
-<span class="source-line-no">548</span><span id="line-548"> // Instantiate the custom heartbeat region scanners</span>
-<span class="source-line-no">549</span><span id="line-549"> @Override</span>
-<span class="source-line-no">550</span><span id="line-550"> protected RegionScannerImpl instantiateRegionScanner(Scan scan,</span>
-<span class="source-line-no">551</span><span id="line-551"> List<KeyValueScanner> additionalScanners, long nonceGroup, long nonce) throws IOException {</span>
-<span class="source-line-no">552</span><span id="line-552"> if (scan.isReversed()) {</span>
-<span class="source-line-no">553</span><span id="line-553"> if (scan.getFilter() != null) {</span>
-<span class="source-line-no">554</span><span id="line-554"> scan.getFilter().setReversed(true);</span>
-<span class="source-line-no">555</span><span id="line-555"> }</span>
-<span class="source-line-no">556</span><span id="line-556"> return new HeartbeatReversedRegionScanner(scan, additionalScanners, this);</span>
-<span class="source-line-no">557</span><span id="line-557"> }</span>
-<span class="source-line-no">558</span><span id="line-558"> return new HeartbeatRegionScanner(scan, additionalScanners, this);</span>
-<span class="source-line-no">559</span><span id="line-559"> }</span>
-<span class="source-line-no">560</span><span id="line-560"> }</span>
-<span class="source-line-no">561</span><span id="line-561"></span>
-<span class="source-line-no">562</span><span id="line-562"> /**</span>
-<span class="source-line-no">563</span><span id="line-563"> * Custom ReversedRegionScanner that can be configured to sleep between retrievals of row Results</span>
-<span class="source-line-no">564</span><span id="line-564"> * and/or column family cells</span>
-<span class="source-line-no">565</span><span id="line-565"> */</span>
-<span class="source-line-no">566</span><span id="line-566"> private static class HeartbeatReversedRegionScanner extends ReversedRegionScannerImpl {</span>
-<span class="source-line-no">567</span><span id="line-567"> HeartbeatReversedRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners,</span>
-<span class="source-line-no">568</span><span id="line-568"> HRegion region) throws IOException {</span>
-<span class="source-line-no">569</span><span id="line-569"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
-<span class="source-line-no">570</span><span id="line-570"> }</span>
-<span class="source-line-no">571</span><span id="line-571"></span>
-<span class="source-line-no">572</span><span id="line-572"> @Override</span>
-<span class="source-line-no">573</span><span id="line-573"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
-<span class="source-line-no">574</span><span id="line-574"> throws IOException {</span>
-<span class="source-line-no">575</span><span id="line-575"> boolean moreRows = super.nextRaw(outResults, context);</span>
-<span class="source-line-no">576</span><span id="line-576"> HeartbeatHRegion.rowSleep();</span>
-<span class="source-line-no">577</span><span id="line-577"> return moreRows;</span>
-<span class="source-line-no">578</span><span id="line-578"> }</span>
-<span class="source-line-no">579</span><span id="line-579"></span>
-<span class="source-line-no">580</span><span id="line-580"> @Override</span>
-<span class="source-line-no">581</span><span id="line-581"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
-<span class="source-line-no">582</span><span id="line-582"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
-<span class="source-line-no">583</span><span id="line-583"> this.storeHeap =</span>
-<span class="source-line-no">584</span><span id="line-584"> new HeartbeatReversedKVHeap(scanners, (CellComparatorImpl) region.getCellComparator());</span>
-<span class="source-line-no">585</span><span id="line-585"> if (!joinedScanners.isEmpty()) {</span>
-<span class="source-line-no">586</span><span id="line-586"> this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners,</span>
-<span class="source-line-no">587</span><span id="line-587"> (CellComparatorImpl) region.getCellComparator());</span>
-<span class="source-line-no">588</span><span id="line-588"> }</span>
-<span class="source-line-no">589</span><span id="line-589"> }</span>
-<span class="source-line-no">590</span><span id="line-590"> }</span>
-<span class="source-line-no">591</span><span id="line-591"></span>
-<span class="source-line-no">592</span><span id="line-592"> /**</span>
-<span class="source-line-no">593</span><span id="line-593"> * Custom RegionScanner that can be configured to sleep between retrievals of row Results and/or</span>
-<span class="source-line-no">594</span><span id="line-594"> * column family cells</span>
-<span class="source-line-no">595</span><span id="line-595"> */</span>
-<span class="source-line-no">596</span><span id="line-596"> private static class HeartbeatRegionScanner extends RegionScannerImpl {</span>
-<span class="source-line-no">597</span><span id="line-597"> HeartbeatRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners, HRegion region)</span>
+<span class="source-line-no">542</span><span id="line-542"> // Instantiate the custom heartbeat region scanners</span>
+<span class="source-line-no">543</span><span id="line-543"> @Override</span>
+<span class="source-line-no">544</span><span id="line-544"> protected RegionScannerImpl instantiateRegionScanner(Scan scan,</span>
+<span class="source-line-no">545</span><span id="line-545"> List<KeyValueScanner> additionalScanners, long nonceGroup, long nonce) throws IOException {</span>
+<span class="source-line-no">546</span><span id="line-546"> if (scan.isReversed()) {</span>
+<span class="source-line-no">547</span><span id="line-547"> if (scan.getFilter() != null) {</span>
+<span class="source-line-no">548</span><span id="line-548"> scan.getFilter().setReversed(true);</span>
+<span class="source-line-no">549</span><span id="line-549"> }</span>
+<span class="source-line-no">550</span><span id="line-550"> return new HeartbeatReversedRegionScanner(scan, additionalScanners, this);</span>
+<span class="source-line-no">551</span><span id="line-551"> }</span>
+<span class="source-line-no">552</span><span id="line-552"> return new HeartbeatRegionScanner(scan, additionalScanners, this);</span>
+<span class="source-line-no">553</span><span id="line-553"> }</span>
+<span class="source-line-no">554</span><span id="line-554"> }</span>
+<span class="source-line-no">555</span><span id="line-555"></span>
+<span class="source-line-no">556</span><span id="line-556"> /**</span>
+<span class="source-line-no">557</span><span id="line-557"> * Custom ReversedRegionScanner that can be configured to sleep between retrievals of row Results</span>
+<span class="source-line-no">558</span><span id="line-558"> * and/or column family cells</span>
+<span class="source-line-no">559</span><span id="line-559"> */</span>
+<span class="source-line-no">560</span><span id="line-560"> private static class HeartbeatReversedRegionScanner extends ReversedRegionScannerImpl {</span>
+<span class="source-line-no">561</span><span id="line-561"> HeartbeatReversedRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners,</span>
+<span class="source-line-no">562</span><span id="line-562"> HRegion region) throws IOException {</span>
+<span class="source-line-no">563</span><span id="line-563"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
+<span class="source-line-no">564</span><span id="line-564"> }</span>
+<span class="source-line-no">565</span><span id="line-565"></span>
+<span class="source-line-no">566</span><span id="line-566"> @Override</span>
+<span class="source-line-no">567</span><span id="line-567"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
+<span class="source-line-no">568</span><span id="line-568"> throws IOException {</span>
+<span class="source-line-no">569</span><span id="line-569"> boolean moreRows = super.nextRaw(outResults, context);</span>
+<span class="source-line-no">570</span><span id="line-570"> HeartbeatHRegion.rowSleep();</span>
+<span class="source-line-no">571</span><span id="line-571"> return moreRows;</span>
+<span class="source-line-no">572</span><span id="line-572"> }</span>
+<span class="source-line-no">573</span><span id="line-573"></span>
+<span class="source-line-no">574</span><span id="line-574"> @Override</span>
+<span class="source-line-no">575</span><span id="line-575"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
+<span class="source-line-no">576</span><span id="line-576"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
+<span class="source-line-no">577</span><span id="line-577"> this.storeHeap =</span>
+<span class="source-line-no">578</span><span id="line-578"> new HeartbeatReversedKVHeap(scanners, (CellComparatorImpl) region.getCellComparator());</span>
+<span class="source-line-no">579</span><span id="line-579"> if (!joinedScanners.isEmpty()) {</span>
+<span class="source-line-no">580</span><span id="line-580"> this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners,</span>
+<span class="source-line-no">581</span><span id="line-581"> (CellComparatorImpl) region.getCellComparator());</span>
+<span class="source-line-no">582</span><span id="line-582"> }</span>
+<span class="source-line-no">583</span><span id="line-583"> }</span>
+<span class="source-line-no">584</span><span id="line-584"> }</span>
+<span class="source-line-no">585</span><span id="line-585"></span>
+<span class="source-line-no">586</span><span id="line-586"> /**</span>
+<span class="source-line-no">587</span><span id="line-587"> * Custom RegionScanner that can be configured to sleep between retrievals of row Results and/or</span>
+<span class="source-line-no">588</span><span id="line-588"> * column family cells</span>
+<span class="source-line-no">589</span><span id="line-589"> */</span>
+<span class="source-line-no">590</span><span id="line-590"> private static class HeartbeatRegionScanner extends RegionScannerImpl {</span>
+<span class="source-line-no">591</span><span id="line-591"> HeartbeatRegionScanner(Scan scan, List<KeyValueScanner> additionalScanners, HRegion region)</span>
+<span class="source-line-no">592</span><span id="line-592"> throws IOException {</span>
+<span class="source-line-no">593</span><span id="line-593"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
+<span class="source-line-no">594</span><span id="line-594"> }</span>
+<span class="source-line-no">595</span><span id="line-595"></span>
+<span class="source-line-no">596</span><span id="line-596"> @Override</span>
+<span class="source-line-no">597</span><span id="line-597"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
<span class="source-line-no">598</span><span id="line-598"> throws IOException {</span>
-<span class="source-line-no">599</span><span id="line-599"> super(scan, additionalScanners, region, HConstants.NO_NONCE, HConstants.NO_NONCE);</span>
-<span class="source-line-no">600</span><span id="line-600"> }</span>
-<span class="source-line-no">601</span><span id="line-601"></span>
-<span class="source-line-no">602</span><span id="line-602"> @Override</span>
-<span class="source-line-no">603</span><span id="line-603"> public boolean nextRaw(List<? super ExtendedCell> outResults, ScannerContext context)</span>
-<span class="source-line-no">604</span><span id="line-604"> throws IOException {</span>
-<span class="source-line-no">605</span><span id="line-605"> boolean moreRows = super.nextRaw(outResults, context);</span>
-<span class="source-line-no">606</span><span id="line-606"> HeartbeatHRegion.rowSleep();</span>
-<span class="source-line-no">607</span><span id="line-607"> return moreRows;</span>
-<span class="source-line-no">608</span><span id="line-608"> }</span>
-<span class="source-line-no">609</span><span id="line-609"></span>
-<span class="source-line-no">610</span><span id="line-610"> @Override</span>
-<span class="source-line-no">611</span><span id="line-611"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
-<span class="source-line-no">612</span><span id="line-612"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
-<span class="source-line-no">613</span><span id="line-613"> this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());</span>
-<span class="source-line-no">614</span><span id="line-614"> if (!joinedScanners.isEmpty()) {</span>
-<span class="source-line-no">615</span><span id="line-615"> this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());</span>
-<span class="source-line-no">616</span><span id="line-616"> }</span>
-<span class="source-line-no">617</span><span id="line-617"> }</span>
-<span class="source-line-no">618</span><span id="line-618"> }</span>
-<span class="source-line-no">619</span><span id="line-619"></span>
-<span class="source-line-no">620</span><span id="line-620"> /**</span>
-<span class="source-line-no">621</span><span id="line-621"> * Custom KV Heap that can be configured to sleep/wait in between retrievals of column family</span>
-<span class="source-line-no">622</span><span id="line-622"> * cells. Useful for testing</span>
-<span class="source-line-no">623</span><span id="line-623"> */</span>
-<span class="source-line-no">624</span><span id="line-624"> private static final class HeartbeatKVHeap extends KeyValueHeap {</span>
-<span class="source-line-no">625</span><span id="line-625"> public HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator)</span>
-<span class="source-line-no">626</span><span id="line-626"> throws IOException {</span>
-<span class="source-line-no">627</span><span id="line-627"> super(scanners, comparator);</span>
-<span class="source-line-no">628</span><span id="line-628"> }</span>
-<span class="source-line-no">629</span><span id="line-629"></span>
-<span class="source-line-no">630</span><span id="line-630"> HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, KVScannerComparator comparator)</span>
+<span class="source-line-no">599</span><span id="line-599"> boolean moreRows = super.nextRaw(outResults, context);</span>
+<span class="source-line-no">600</span><span id="line-600"> HeartbeatHRegion.rowSleep();</span>
+<span class="source-line-no">601</span><span id="line-601"> return moreRows;</span>
+<span class="source-line-no">602</span><span id="line-602"> }</span>
+<span class="source-line-no">603</span><span id="line-603"></span>
+<span class="source-line-no">604</span><span id="line-604"> @Override</span>
+<span class="source-line-no">605</span><span id="line-605"> protected void initializeKVHeap(List<KeyValueScanner> scanners,</span>
+<span class="source-line-no">606</span><span id="line-606"> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {</span>
+<span class="source-line-no">607</span><span id="line-607"> this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());</span>
+<span class="source-line-no">608</span><span id="line-608"> if (!joinedScanners.isEmpty()) {</span>
+<span class="source-line-no">609</span><span id="line-609"> this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());</span>
+<span class="source-line-no">610</span><span id="line-610"> }</span>
+<span class="source-line-no">611</span><span id="line-611"> }</span>
+<span class="source-line-no">612</span><span id="line-612"> }</span>
+<span class="source-line-no">613</span><span id="line-613"></span>
+<span class="source-line-no">614</span><span id="line-614"> /**</span>
+<span class="source-line-no">615</span><span id="line-615"> * Custom KV Heap that can be configured to sleep/wait in between retrievals of column family</span>
+<span class="source-line-no">616</span><span id="line-616"> * cells. Useful for testing</span>
+<span class="source-line-no">617</span><span id="line-617"> */</span>
+<span class="source-line-no">618</span><span id="line-618"> private static final class HeartbeatKVHeap extends KeyValueHeap {</span>
+<span class="source-line-no">619</span><span id="line-619"> public HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, CellComparator comparator)</span>
+<span class="source-line-no">620</span><span id="line-620"> throws IOException {</span>
+<span class="source-line-no">621</span><span id="line-621"> super(scanners, comparator);</span>
+<span class="source-line-no">622</span><span id="line-622"> }</span>
+<span class="source-line-no">623</span><span id="line-623"></span>
+<span class="source-line-no">624</span><span id="line-624"> HeartbeatKVHeap(List<? extends KeyValueScanner> scanners, KVScannerComparator comparator)</span>
+<span class="source-line-no">625</span><span id="line-625"> throws IOException {</span>
+<span class="source-line-no">626</span><span id="line-626"> super(scanners, comparator);</span>
+<span class="source-line-no">627</span><span id="line-627"> }</span>
+<span class="source-line-no">628</span><span id="line-628"></span>
+<span class="source-line-no">629</span><span id="line-629"> @Override</span>
+<span class="source-line-no">630</span><span id="line-630"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
<span class="source-line-no">631</span><span id="line-631"> throws IOException {</span>
-<span class="source-line-no">632</span><span id="line-632"> super(scanners, comparator);</span>
-<span class="source-line-no">633</span><span id="line-633"> }</span>
-<span class="source-line-no">634</span><span id="line-634"></span>
-<span class="source-line-no">635</span><span id="line-635"> @Override</span>
-<span class="source-line-no">636</span><span id="line-636"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
-<span class="source-line-no">637</span><span id="line-637"> throws IOException {</span>
-<span class="source-line-no">638</span><span id="line-638"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">639</span><span id="line-639"> boolean moreRows = super.next(result, context);</span>
-<span class="source-line-no">640</span><span id="line-640"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">641</span><span id="line-641"> return moreRows;</span>
-<span class="source-line-no">642</span><span id="line-642"> }</span>
-<span class="source-line-no">643</span><span id="line-643"> }</span>
-<span class="source-line-no">644</span><span id="line-644"></span>
-<span class="source-line-no">645</span><span id="line-645"> /**</span>
-<span class="source-line-no">646</span><span id="line-646"> * Custom reversed KV Heap that can be configured to sleep in between retrievals of column family</span>
-<span class="source-line-no">647</span><span id="line-647"> * cells.</span>
-<span class="source-line-no">648</span><span id="line-648"> */</span>
-<span class="source-line-no">649</span><span id="line-649"> private static final class HeartbeatReversedKVHeap extends ReversedKeyValueHeap {</span>
-<span class="source-line-no">650</span><span id="line-650"> public HeartbeatReversedKVHeap(List<? extends KeyValueScanner> scanners,</span>
-<span class="source-line-no">651</span><span id="line-651"> CellComparatorImpl comparator) throws IOException {</span>
-<span class="source-line-no">652</span><span id="line-652"> super(scanners, comparator);</span>
-<span class="source-line-no">653</span><span id="line-653"> }</span>
-<span class="source-line-no">654</span><span id="line-654"></span>
-<span class="source-line-no">655</span><span id="line-655"> @Override</span>
-<span class="source-line-no">656</span><span id="line-656"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
-<span class="source-line-no">657</span><span id="line-657"> throws IOException {</span>
-<span class="source-line-no">658</span><span id="line-658"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">659</span><span id="line-659"> boolean moreRows = super.next(result, context);</span>
-<span class="source-line-no">660</span><span id="line-660"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
-<span class="source-line-no">661</span><span id="line-661"> return moreRows;</span>
-<span class="source-line-no">662</span><span id="line-662"> }</span>
-<span class="source-line-no">663</span><span id="line-663"> }</span>
-<span class="source-line-no">664</span><span id="line-664">}</span>
+<span class="source-line-no">632</span><span id="line-632"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">633</span><span id="line-633"> boolean moreRows = super.next(result, context);</span>
+<span class="source-line-no">634</span><span id="line-634"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">635</span><span id="line-635"> return moreRows;</span>
+<span class="source-line-no">636</span><span id="line-636"> }</span>
+<span class="source-line-no">637</span><span id="line-637"> }</span>
+<span class="source-line-no">638</span><span id="line-638"></span>
+<span class="source-line-no">639</span><span id="line-639"> /**</span>
+<span class="source-line-no">640</span><span id="line-640"> * Custom reversed KV Heap that can be configured to sleep in between retrievals of column family</span>
+<span class="source-line-no">641</span><span id="line-641"> * cells.</span>
+<span class="source-line-no">642</span><span id="line-642"> */</span>
+<span class="source-line-no">643</span><span id="line-643"> private static final class HeartbeatReversedKVHeap extends ReversedKeyValueHeap {</span>
+<span class="source-line-no">644</span><span id="line-644"> public HeartbeatReversedKVHeap(List<? extends KeyValueScanner> scanners,</span>
+<span class="source-line-no">645</span><span id="line-645"> CellComparatorImpl comparator) throws IOException {</span>
+<span class="source-line-no">646</span><span id="line-646"> super(scanners, comparator);</span>
+<span class="source-line-no">647</span><span id="line-647"> }</span>
+<span class="source-line-no">648</span><span id="line-648"></span>
+<span class="source-line-no">649</span><span id="line-649"> @Override</span>
+<span class="source-line-no">650</span><span id="line-650"> public boolean next(List<? super ExtendedCell> result, ScannerContext context)</span>
+<span class="source-line-no">651</span><span id="line-651"> throws IOException {</span>
+<span class="source-line-no">652</span><span id="line-652"> if (HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">653</span><span id="line-653"> boolean moreRows = super.next(result, context);</span>
+<span class="source-line-no">654</span><span id="line-654"> if (!HeartbeatHRegion.sleepBeforeColumnFamily) HeartbeatHRegion.columnFamilySleep();</span>
+<span class="source-line-no">655</span><span id="line-655"> return moreRows;</span>
+<span class="source-line-no">656</span><span id="line-656"> }</span>
+<span class="source-line-no">657</span><span id="line-657"> }</span>
+<span class="source-line-no">658</span><span id="line-658">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.MockedQuotaManagerRegionServer.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.MockedQuotaManagerRegionServer.html
index 4f7bc957e29..f9a12991216 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.MockedQuotaManagerRegionServer.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.MockedQuotaManagerRegionServer.html
@@ -34,199 +34,194 @@
<span class="source-line-no">021</span><span id="line-21">import java.util.List;</span>
<span class="source-line-no">022</span><span id="line-22">import java.util.concurrent.atomic.AtomicBoolean;</span>
<span class="source-line-no">023</span><span id="line-23">import org.apache.hadoop.conf.Configuration;</span>
-<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.SingleProcessHBaseCluster;</span>
-<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.StartTestingClusterOption;</span>
-<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.Connection;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.quotas.OperationQuota;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.quotas.RegionServerRpcQuotaManager;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.quotas.RpcThrottlingException;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.quotas.TestNoopOperationQuota;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.testclassification.ClientTests;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.junit.AfterClass;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.junit.Before;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.junit.BeforeClass;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.junit.ClassRule;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.junit.Test;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.junit.experimental.categories.Category;</span>
+<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.SingleProcessHBaseCluster;</span>
+<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.StartTestingClusterOption;</span>
+<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.Connection;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.quotas.OperationQuota;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.quotas.RegionServerRpcQuotaManager;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.quotas.RpcThrottlingException;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.quotas.TestNoopOperationQuota;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.testclassification.ClientTests;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">047</span><span id="line-47"></span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;</span>
<span class="source-line-no">049</span><span id="line-49"></span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">@Category({ MediumTests.class, ClientTests.class })</span>
-<span class="source-line-no">053</span><span id="line-53">public class TestScannerLeaseCount {</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55"> @ClassRule</span>
-<span class="source-line-no">056</span><span id="line-56"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">057</span><span id="line-57"> HBaseClassTestRule.forClass(TestScannerLeaseCount.class);</span>
-<span class="source-line-no">058</span><span id="line-58"></span>
-<span class="source-line-no">059</span><span id="line-59"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">060</span><span id="line-60"> private static final TableName TABLE_NAME = TableName.valueOf("ScannerLeaseCount");</span>
-<span class="source-line-no">061</span><span id="line-61"> private static final byte[] FAM = Bytes.toBytes("Fam");</span>
-<span class="source-line-no">062</span><span id="line-62"> private static final String SCAN_IDENTIFIER_NAME = "_scan_id_";</span>
-<span class="source-line-no">063</span><span id="line-63"> private static final byte[] SCAN_IDENTIFIER = Bytes.toBytes("_scan_id_");</span>
-<span class="source-line-no">064</span><span id="line-64"> private static final Scan SCAN = new Scan().setAttribute(SCAN_IDENTIFIER_NAME, SCAN_IDENTIFIER);</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> private static volatile boolean SHOULD_THROW = false;</span>
-<span class="source-line-no">067</span><span id="line-67"> private static final AtomicBoolean EXCEPTION_THROWN = new AtomicBoolean(false);</span>
-<span class="source-line-no">068</span><span id="line-68"> private static final AtomicBoolean SCAN_SEEN = new AtomicBoolean(false);</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70"> private static Connection CONN;</span>
-<span class="source-line-no">071</span><span id="line-71"> private static Table TABLE;</span>
-<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73"> @BeforeClass</span>
-<span class="source-line-no">074</span><span id="line-74"> public static void setUp() throws Exception {</span>
-<span class="source-line-no">075</span><span id="line-75"> StartTestingClusterOption option =</span>
-<span class="source-line-no">076</span><span id="line-76"> StartTestingClusterOption.builder().rsClass(MockedQuotaManagerRegionServer.class).build();</span>
-<span class="source-line-no">077</span><span id="line-77"> UTIL.startMiniCluster(option);</span>
-<span class="source-line-no">078</span><span id="line-78"> UTIL.getAdmin().createTable(TableDescriptorBuilder.newBuilder(TABLE_NAME)</span>
-<span class="source-line-no">079</span><span id="line-79"> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM)).build());</span>
-<span class="source-line-no">080</span><span id="line-80"> Configuration conf = new Configuration(UTIL.getConfiguration());</span>
-<span class="source-line-no">081</span><span id="line-81"> CONN = ConnectionFactory.createConnection(conf);</span>
-<span class="source-line-no">082</span><span id="line-82"> TABLE = CONN.getTable(TABLE_NAME);</span>
-<span class="source-line-no">083</span><span id="line-83"> UTIL.loadTable(TABLE, FAM);</span>
-<span class="source-line-no">084</span><span id="line-84"> }</span>
-<span class="source-line-no">085</span><span id="line-85"></span>
-<span class="source-line-no">086</span><span id="line-86"> @AfterClass</span>
-<span class="source-line-no">087</span><span id="line-87"> public static void tearDown() throws Exception {</span>
-<span class="source-line-no">088</span><span id="line-88"> try {</span>
-<span class="source-line-no">089</span><span id="line-89"> TABLE.close();</span>
-<span class="source-line-no">090</span><span id="line-90"> } catch (Exception ignore) {</span>
-<span class="source-line-no">091</span><span id="line-91"> }</span>
-<span class="source-line-no">092</span><span id="line-92"> try {</span>
-<span class="source-line-no">093</span><span id="line-93"> CONN.close();</span>
-<span class="source-line-no">094</span><span id="line-94"> } catch (Exception ignore) {</span>
-<span class="source-line-no">095</span><span id="line-95"> }</span>
-<span class="source-line-no">096</span><span id="line-96"> UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">097</span><span id="line-97"> }</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99"> @Before</span>
-<span class="source-line-no">100</span><span id="line-100"> public void before() {</span>
-<span class="source-line-no">101</span><span id="line-101"> SHOULD_THROW = false;</span>
-<span class="source-line-no">102</span><span id="line-102"> SCAN_SEEN.set(false);</span>
-<span class="source-line-no">103</span><span id="line-103"> EXCEPTION_THROWN.set(false);</span>
-<span class="source-line-no">104</span><span id="line-104"> }</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106"> @Test</span>
-<span class="source-line-no">107</span><span id="line-107"> public void itIncreasesScannerCount() throws Exception {</span>
-<span class="source-line-no">108</span><span id="line-108"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
-<span class="source-line-no">109</span><span id="line-109"> // We need to wait until the scan and lease are created server-side.</span>
-<span class="source-line-no">110</span><span id="line-110"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
-<span class="source-line-no">111</span><span id="line-111"> UTIL.waitFor(1000, () -> SCAN_SEEN.get() && !EXCEPTION_THROWN.get());</span>
-<span class="source-line-no">112</span><span id="line-112"> }</span>
-<span class="source-line-no">113</span><span id="line-113"> }</span>
-<span class="source-line-no">114</span><span id="line-114"></span>
-<span class="source-line-no">115</span><span id="line-115"> @Test</span>
-<span class="source-line-no">116</span><span id="line-116"> public void itDoesNotIncreaseScannerLeaseCount() throws Exception {</span>
-<span class="source-line-no">117</span><span id="line-117"> SHOULD_THROW = true;</span>
-<span class="source-line-no">118</span><span id="line-118"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
-<span class="source-line-no">119</span><span id="line-119"> // We need to wait until the scan and lease are created server-side.</span>
-<span class="source-line-no">120</span><span id="line-120"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
-<span class="source-line-no">121</span><span id="line-121"> UTIL.waitFor(1000, () -> !SCAN_SEEN.get() && EXCEPTION_THROWN.get());</span>
-<span class="source-line-no">122</span><span id="line-122"> }</span>
-<span class="source-line-no">123</span><span id="line-123"> }</span>
-<span class="source-line-no">124</span><span id="line-124"></span>
-<span class="source-line-no">125</span><span id="line-125"> public static final class MockedQuotaManagerRegionServer</span>
-<span class="source-line-no">126</span><span id="line-126"> extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {</span>
-<span class="source-line-no">127</span><span id="line-127"> private final MockedRpcQuotaManager rpcQuotaManager;</span>
-<span class="source-line-no">128</span><span id="line-128"></span>
-<span class="source-line-no">129</span><span id="line-129"> public MockedQuotaManagerRegionServer(Configuration conf)</span>
-<span class="source-line-no">130</span><span id="line-130"> throws IOException, InterruptedException {</span>
-<span class="source-line-no">131</span><span id="line-131"> super(conf);</span>
-<span class="source-line-no">132</span><span id="line-132"> this.rpcQuotaManager = new MockedRpcQuotaManager(this);</span>
+<span class="source-line-no">050</span><span id="line-50">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">051</span><span id="line-51">@Tag(ClientTests.TAG)</span>
+<span class="source-line-no">052</span><span id="line-52">public class TestScannerLeaseCount {</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">055</span><span id="line-55"> private static final TableName TABLE_NAME = TableName.valueOf("ScannerLeaseCount");</span>
+<span class="source-line-no">056</span><span id="line-56"> private static final byte[] FAM = Bytes.toBytes("Fam");</span>
+<span class="source-line-no">057</span><span id="line-57"> private static final String SCAN_IDENTIFIER_NAME = "_scan_id_";</span>
+<span class="source-line-no">058</span><span id="line-58"> private static final byte[] SCAN_IDENTIFIER = Bytes.toBytes("_scan_id_");</span>
+<span class="source-line-no">059</span><span id="line-59"> private static final Scan SCAN = new Scan().setAttribute(SCAN_IDENTIFIER_NAME, SCAN_IDENTIFIER);</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61"> private static volatile boolean SHOULD_THROW = false;</span>
+<span class="source-line-no">062</span><span id="line-62"> private static final AtomicBoolean EXCEPTION_THROWN = new AtomicBoolean(false);</span>
+<span class="source-line-no">063</span><span id="line-63"> private static final AtomicBoolean SCAN_SEEN = new AtomicBoolean(false);</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65"> private static Connection CONN;</span>
+<span class="source-line-no">066</span><span id="line-66"> private static Table TABLE;</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68"> @BeforeAll</span>
+<span class="source-line-no">069</span><span id="line-69"> public static void setUp() throws Exception {</span>
+<span class="source-line-no">070</span><span id="line-70"> StartTestingClusterOption option =</span>
+<span class="source-line-no">071</span><span id="line-71"> StartTestingClusterOption.builder().rsClass(MockedQuotaManagerRegionServer.class).build();</span>
+<span class="source-line-no">072</span><span id="line-72"> UTIL.startMiniCluster(option);</span>
+<span class="source-line-no">073</span><span id="line-73"> UTIL.getAdmin().createTable(TableDescriptorBuilder.newBuilder(TABLE_NAME)</span>
+<span class="source-line-no">074</span><span id="line-74"> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM)).build());</span>
+<span class="source-line-no">075</span><span id="line-75"> Configuration conf = new Configuration(UTIL.getConfiguration());</span>
+<span class="source-line-no">076</span><span id="line-76"> CONN = ConnectionFactory.createConnection(conf);</span>
+<span class="source-line-no">077</span><span id="line-77"> TABLE = CONN.getTable(TABLE_NAME);</span>
+<span class="source-line-no">078</span><span id="line-78"> UTIL.loadTable(TABLE, FAM);</span>
+<span class="source-line-no">079</span><span id="line-79"> }</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81"> @AfterAll</span>
+<span class="source-line-no">082</span><span id="line-82"> public static void tearDown() throws Exception {</span>
+<span class="source-line-no">083</span><span id="line-83"> try {</span>
+<span class="source-line-no">084</span><span id="line-84"> TABLE.close();</span>
+<span class="source-line-no">085</span><span id="line-85"> } catch (Exception ignore) {</span>
+<span class="source-line-no">086</span><span id="line-86"> }</span>
+<span class="source-line-no">087</span><span id="line-87"> try {</span>
+<span class="source-line-no">088</span><span id="line-88"> CONN.close();</span>
+<span class="source-line-no">089</span><span id="line-89"> } catch (Exception ignore) {</span>
+<span class="source-line-no">090</span><span id="line-90"> }</span>
+<span class="source-line-no">091</span><span id="line-91"> UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">092</span><span id="line-92"> }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94"> @BeforeEach</span>
+<span class="source-line-no">095</span><span id="line-95"> public void before() {</span>
+<span class="source-line-no">096</span><span id="line-96"> SHOULD_THROW = false;</span>
+<span class="source-line-no">097</span><span id="line-97"> SCAN_SEEN.set(false);</span>
+<span class="source-line-no">098</span><span id="line-98"> EXCEPTION_THROWN.set(false);</span>
+<span class="source-line-no">099</span><span id="line-99"> }</span>
+<span class="source-line-no">100</span><span id="line-100"></span>
+<span class="source-line-no">101</span><span id="line-101"> @Test</span>
+<span class="source-line-no">102</span><span id="line-102"> public void itIncreasesScannerCount() throws Exception {</span>
+<span class="source-line-no">103</span><span id="line-103"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
+<span class="source-line-no">104</span><span id="line-104"> // We need to wait until the scan and lease are created server-side.</span>
+<span class="source-line-no">105</span><span id="line-105"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
+<span class="source-line-no">106</span><span id="line-106"> UTIL.waitFor(1000, () -> SCAN_SEEN.get() && !EXCEPTION_THROWN.get());</span>
+<span class="source-line-no">107</span><span id="line-107"> }</span>
+<span class="source-line-no">108</span><span id="line-108"> }</span>
+<span class="source-line-no">109</span><span id="line-109"></span>
+<span class="source-line-no">110</span><span id="line-110"> @Test</span>
+<span class="source-line-no">111</span><span id="line-111"> public void itDoesNotIncreaseScannerLeaseCount() throws Exception {</span>
+<span class="source-line-no">112</span><span id="line-112"> SHOULD_THROW = true;</span>
+<span class="source-line-no">113</span><span id="line-113"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
+<span class="source-line-no">114</span><span id="line-114"> // We need to wait until the scan and lease are created server-side.</span>
+<span class="source-line-no">115</span><span id="line-115"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
+<span class="source-line-no">116</span><span id="line-116"> UTIL.waitFor(1000, () -> !SCAN_SEEN.get() && EXCEPTION_THROWN.get());</span>
+<span class="source-line-no">117</span><span id="line-117"> }</span>
+<span class="source-line-no">118</span><span id="line-118"> }</span>
+<span class="source-line-no">119</span><span id="line-119"></span>
+<span class="source-line-no">120</span><span id="line-120"> public static final class MockedQuotaManagerRegionServer</span>
+<span class="source-line-no">121</span><span id="line-121"> extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {</span>
+<span class="source-line-no">122</span><span id="line-122"> private final MockedRpcQuotaManager rpcQuotaManager;</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124"> public MockedQuotaManagerRegionServer(Configuration conf)</span>
+<span class="source-line-no">125</span><span id="line-125"> throws IOException, InterruptedException {</span>
+<span class="source-line-no">126</span><span id="line-126"> super(conf);</span>
+<span class="source-line-no">127</span><span id="line-127"> this.rpcQuotaManager = new MockedRpcQuotaManager(this);</span>
+<span class="source-line-no">128</span><span id="line-128"> }</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130"> @Override</span>
+<span class="source-line-no">131</span><span id="line-131"> public RegionServerRpcQuotaManager getRegionServerRpcQuotaManager() {</span>
+<span class="source-line-no">132</span><span id="line-132"> return rpcQuotaManager;</span>
<span class="source-line-no">133</span><span id="line-133"> }</span>
<span class="source-line-no">134</span><span id="line-134"></span>
<span class="source-line-no">135</span><span id="line-135"> @Override</span>
-<span class="source-line-no">136</span><span id="line-136"> public RegionServerRpcQuotaManager getRegionServerRpcQuotaManager() {</span>
-<span class="source-line-no">137</span><span id="line-137"> return rpcQuotaManager;</span>
+<span class="source-line-no">136</span><span id="line-136"> protected RSRpcServices createRpcServices() throws IOException {</span>
+<span class="source-line-no">137</span><span id="line-137"> return new ScannerTrackingRSRpcServicesForTest(this);</span>
<span class="source-line-no">138</span><span id="line-138"> }</span>
-<span class="source-line-no">139</span><span id="line-139"></span>
-<span class="source-line-no">140</span><span id="line-140"> @Override</span>
-<span class="source-line-no">141</span><span id="line-141"> protected RSRpcServices createRpcServices() throws IOException {</span>
-<span class="source-line-no">142</span><span id="line-142"> return new ScannerTrackingRSRpcServicesForTest(this);</span>
-<span class="source-line-no">143</span><span id="line-143"> }</span>
-<span class="source-line-no">144</span><span id="line-144"> }</span>
-<span class="source-line-no">145</span><span id="line-145"></span>
-<span class="source-line-no">146</span><span id="line-146"> private static class MockedRpcQuotaManager extends RegionServerRpcQuotaManager {</span>
-<span class="source-line-no">147</span><span id="line-147"> private static final RpcThrottlingException EX = new RpcThrottlingException("test_ex");</span>
-<span class="source-line-no">148</span><span id="line-148"></span>
-<span class="source-line-no">149</span><span id="line-149"> public MockedRpcQuotaManager(RegionServerServices rsServices) {</span>
-<span class="source-line-no">150</span><span id="line-150"> super(rsServices);</span>
-<span class="source-line-no">151</span><span id="line-151"> }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> @Override</span>
-<span class="source-line-no">154</span><span id="line-154"> public OperationQuota checkScanQuota(Region region, ClientProtos.ScanRequest scanRequest,</span>
-<span class="source-line-no">155</span><span id="line-155"> long maxScannerResultSize, long maxBlockBytesScanned, long prevBlockBytesScannedDifference)</span>
-<span class="source-line-no">156</span><span id="line-156"> throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">157</span><span id="line-157"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">158</span><span id="line-158"> if (isTestScan(scanRequest)) {</span>
-<span class="source-line-no">159</span><span id="line-159"> EXCEPTION_THROWN.set(true);</span>
-<span class="source-line-no">160</span><span id="line-160"> }</span>
-<span class="source-line-no">161</span><span id="line-161"> throw EX;</span>
-<span class="source-line-no">162</span><span id="line-162"> }</span>
-<span class="source-line-no">163</span><span id="line-163"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">164</span><span id="line-164"> }</span>
-<span class="source-line-no">165</span><span id="line-165"></span>
-<span class="source-line-no">166</span><span id="line-166"> @Override</span>
-<span class="source-line-no">167</span><span id="line-167"> public OperationQuota checkBatchQuota(Region region, OperationQuota.OperationType type)</span>
-<span class="source-line-no">168</span><span id="line-168"> throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">169</span><span id="line-169"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">170</span><span id="line-170"> throw EX;</span>
-<span class="source-line-no">171</span><span id="line-171"> }</span>
-<span class="source-line-no">172</span><span id="line-172"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">173</span><span id="line-173"> }</span>
-<span class="source-line-no">174</span><span id="line-174"></span>
-<span class="source-line-no">175</span><span id="line-175"> @Override</span>
-<span class="source-line-no">176</span><span id="line-176"> public OperationQuota checkBatchQuota(Region region, List<ClientProtos.Action> actions,</span>
-<span class="source-line-no">177</span><span id="line-177"> boolean hasCondition) throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">178</span><span id="line-178"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">179</span><span id="line-179"> throw EX;</span>
-<span class="source-line-no">180</span><span id="line-180"> }</span>
-<span class="source-line-no">181</span><span id="line-181"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">182</span><span id="line-182"> }</span>
-<span class="source-line-no">183</span><span id="line-183"></span>
-<span class="source-line-no">184</span><span id="line-184"> @Override</span>
-<span class="source-line-no">185</span><span id="line-185"> public OperationQuota checkBatchQuota(Region region, int numWrites, int numReads,</span>
-<span class="source-line-no">186</span><span id="line-186"> boolean isAtomic) throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">187</span><span id="line-187"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">188</span><span id="line-188"> throw EX;</span>
-<span class="source-line-no">189</span><span id="line-189"> }</span>
-<span class="source-line-no">190</span><span id="line-190"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">191</span><span id="line-191"> }</span>
-<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">139</span><span id="line-139"> }</span>
+<span class="source-line-no">140</span><span id="line-140"></span>
+<span class="source-line-no">141</span><span id="line-141"> private static class MockedRpcQuotaManager extends RegionServerRpcQuotaManager {</span>
+<span class="source-line-no">142</span><span id="line-142"> private static final RpcThrottlingException EX = new RpcThrottlingException("test_ex");</span>
+<span class="source-line-no">143</span><span id="line-143"></span>
+<span class="source-line-no">144</span><span id="line-144"> public MockedRpcQuotaManager(RegionServerServices rsServices) {</span>
+<span class="source-line-no">145</span><span id="line-145"> super(rsServices);</span>
+<span class="source-line-no">146</span><span id="line-146"> }</span>
+<span class="source-line-no">147</span><span id="line-147"></span>
+<span class="source-line-no">148</span><span id="line-148"> @Override</span>
+<span class="source-line-no">149</span><span id="line-149"> public OperationQuota checkScanQuota(Region region, ClientProtos.ScanRequest scanRequest,</span>
+<span class="source-line-no">150</span><span id="line-150"> long maxScannerResultSize, long maxBlockBytesScanned, long prevBlockBytesScannedDifference)</span>
+<span class="source-line-no">151</span><span id="line-151"> throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">152</span><span id="line-152"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">153</span><span id="line-153"> if (isTestScan(scanRequest)) {</span>
+<span class="source-line-no">154</span><span id="line-154"> EXCEPTION_THROWN.set(true);</span>
+<span class="source-line-no">155</span><span id="line-155"> }</span>
+<span class="source-line-no">156</span><span id="line-156"> throw EX;</span>
+<span class="source-line-no">157</span><span id="line-157"> }</span>
+<span class="source-line-no">158</span><span id="line-158"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">159</span><span id="line-159"> }</span>
+<span class="source-line-no">160</span><span id="line-160"></span>
+<span class="source-line-no">161</span><span id="line-161"> @Override</span>
+<span class="source-line-no">162</span><span id="line-162"> public OperationQuota checkBatchQuota(Region region, OperationQuota.OperationType type)</span>
+<span class="source-line-no">163</span><span id="line-163"> throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">164</span><span id="line-164"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">165</span><span id="line-165"> throw EX;</span>
+<span class="source-line-no">166</span><span id="line-166"> }</span>
+<span class="source-line-no">167</span><span id="line-167"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">168</span><span id="line-168"> }</span>
+<span class="source-line-no">169</span><span id="line-169"></span>
+<span class="source-line-no">170</span><span id="line-170"> @Override</span>
+<span class="source-line-no">171</span><span id="line-171"> public OperationQuota checkBatchQuota(Region region, List<ClientProtos.Action> actions,</span>
+<span class="source-line-no">172</span><span id="line-172"> boolean hasCondition) throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">173</span><span id="line-173"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">174</span><span id="line-174"> throw EX;</span>
+<span class="source-line-no">175</span><span id="line-175"> }</span>
+<span class="source-line-no">176</span><span id="line-176"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">177</span><span id="line-177"> }</span>
+<span class="source-line-no">178</span><span id="line-178"></span>
+<span class="source-line-no">179</span><span id="line-179"> @Override</span>
+<span class="source-line-no">180</span><span id="line-180"> public OperationQuota checkBatchQuota(Region region, int numWrites, int numReads,</span>
+<span class="source-line-no">181</span><span id="line-181"> boolean isAtomic) throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">182</span><span id="line-182"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">183</span><span id="line-183"> throw EX;</span>
+<span class="source-line-no">184</span><span id="line-184"> }</span>
+<span class="source-line-no">185</span><span id="line-185"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">186</span><span id="line-186"> }</span>
+<span class="source-line-no">187</span><span id="line-187"> }</span>
+<span class="source-line-no">188</span><span id="line-188"></span>
+<span class="source-line-no">189</span><span id="line-189"> private static class ScannerTrackingRSRpcServicesForTest extends RSRpcServices {</span>
+<span class="source-line-no">190</span><span id="line-190"> public ScannerTrackingRSRpcServicesForTest(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">191</span><span id="line-191"> super(rs);</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
<span class="source-line-no">193</span><span id="line-193"></span>
-<span class="source-line-no">194</span><span id="line-194"> private static class ScannerTrackingRSRpcServicesForTest extends RSRpcServices {</span>
-<span class="source-line-no">195</span><span id="line-195"> public ScannerTrackingRSRpcServicesForTest(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">196</span><span id="line-196"> super(rs);</span>
-<span class="source-line-no">197</span><span id="line-197"> }</span>
-<span class="source-line-no">198</span><span id="line-198"></span>
-<span class="source-line-no">199</span><span id="line-199"> @Override</span>
-<span class="source-line-no">200</span><span id="line-200"> RegionScannerContext checkQuotaAndGetRegionScannerContext(ClientProtos.ScanRequest request,</span>
-<span class="source-line-no">201</span><span id="line-201"> ClientProtos.ScanResponse.Builder builder) throws IOException {</span>
-<span class="source-line-no">202</span><span id="line-202"> RegionScannerContext rsx = super.checkQuotaAndGetRegionScannerContext(request, builder);</span>
-<span class="source-line-no">203</span><span id="line-203"> if (isTestScan(request)) {</span>
-<span class="source-line-no">204</span><span id="line-204"> SCAN_SEEN.set(true);</span>
-<span class="source-line-no">205</span><span id="line-205"> }</span>
-<span class="source-line-no">206</span><span id="line-206"> return rsx;</span>
-<span class="source-line-no">207</span><span id="line-207"> }</span>
-<span class="source-line-no">208</span><span id="line-208"> }</span>
-<span class="source-line-no">209</span><span id="line-209"></span>
-<span class="source-line-no">210</span><span id="line-210"> private static boolean isTestScan(ClientProtos.ScanRequest request) {</span>
-<span class="source-line-no">211</span><span id="line-211"> ClientProtos.Scan scan = request.getScan();</span>
-<span class="source-line-no">212</span><span id="line-212"> return scan.getAttributeList().stream()</span>
-<span class="source-line-no">213</span><span id="line-213"> .anyMatch(nbp -> nbp.getName().equals(SCAN_IDENTIFIER_NAME)</span>
-<span class="source-line-no">214</span><span id="line-214"> && Bytes.equals(nbp.getValue().toByteArray(), SCAN_IDENTIFIER));</span>
-<span class="source-line-no">215</span><span id="line-215"> }</span>
-<span class="source-line-no">216</span><span id="line-216">}</span>
+<span class="source-line-no">194</span><span id="line-194"> @Override</span>
+<span class="source-line-no">195</span><span id="line-195"> RegionScannerContext checkQuotaAndGetRegionScannerContext(ClientProtos.ScanRequest request,</span>
+<span class="source-line-no">196</span><span id="line-196"> ClientProtos.ScanResponse.Builder builder) throws IOException {</span>
+<span class="source-line-no">197</span><span id="line-197"> RegionScannerContext rsx = super.checkQuotaAndGetRegionScannerContext(request, builder);</span>
+<span class="source-line-no">198</span><span id="line-198"> if (isTestScan(request)) {</span>
+<span class="source-line-no">199</span><span id="line-199"> SCAN_SEEN.set(true);</span>
+<span class="source-line-no">200</span><span id="line-200"> }</span>
+<span class="source-line-no">201</span><span id="line-201"> return rsx;</span>
+<span class="source-line-no">202</span><span id="line-202"> }</span>
+<span class="source-line-no">203</span><span id="line-203"> }</span>
+<span class="source-line-no">204</span><span id="line-204"></span>
+<span class="source-line-no">205</span><span id="line-205"> private static boolean isTestScan(ClientProtos.ScanRequest request) {</span>
+<span class="source-line-no">206</span><span id="line-206"> ClientProtos.Scan scan = request.getScan();</span>
+<span class="source-line-no">207</span><span id="line-207"> return scan.getAttributeList().stream()</span>
+<span class="source-line-no">208</span><span id="line-208"> .anyMatch(nbp -> nbp.getName().equals(SCAN_IDENTIFIER_NAME)</span>
+<span class="source-line-no">209</span><span id="line-209"> && Bytes.equals(nbp.getValue().toByteArray(), SCAN_IDENTIFIER));</span>
+<span class="source-line-no">210</span><span id="line-210"> }</span>
+<span class="source-line-no">211</span><span id="line-211">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html
index f5e80c94bee..4833d023e76 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerLeaseCount.html
@@ -34,199 +34,194 @@
<span class="source-line-no">021</span><span id="line-21">import java.util.List;</span>
<span class="source-line-no">022</span><span id="line-22">import java.util.concurrent.atomic.AtomicBoolean;</span>
<span class="source-line-no">023</span><span id="line-23">import org.apache.hadoop.conf.Configuration;</span>
-<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.SingleProcessHBaseCluster;</span>
-<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.StartTestingClusterOption;</span>
-<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.Connection;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.quotas.OperationQuota;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.quotas.RegionServerRpcQuotaManager;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.quotas.RpcThrottlingException;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.quotas.TestNoopOperationQuota;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.testclassification.ClientTests;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.junit.AfterClass;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.junit.Before;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.junit.BeforeClass;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.junit.ClassRule;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.junit.Test;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.junit.experimental.categories.Category;</span>
+<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.SingleProcessHBaseCluster;</span>
+<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.StartTestingClusterOption;</span>
+<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.Connection;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.quotas.OperationQuota;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.quotas.RegionServerRpcQuotaManager;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.quotas.RpcThrottlingException;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.quotas.TestNoopOperationQuota;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.testclassification.ClientTests;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">047</span><span id="line-47"></span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;</span>
<span class="source-line-no">049</span><span id="line-49"></span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">@Category({ MediumTests.class, ClientTests.class })</span>
-<span class="source-line-no">053</span><span id="line-53">public class TestScannerLeaseCount {</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55"> @ClassRule</span>
-<span class="source-line-no">056</span><span id="line-56"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">057</span><span id="line-57"> HBaseClassTestRule.forClass(TestScannerLeaseCount.class);</span>
-<span class="source-line-no">058</span><span id="line-58"></span>
-<span class="source-line-no">059</span><span id="line-59"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">060</span><span id="line-60"> private static final TableName TABLE_NAME = TableName.valueOf("ScannerLeaseCount");</span>
-<span class="source-line-no">061</span><span id="line-61"> private static final byte[] FAM = Bytes.toBytes("Fam");</span>
-<span class="source-line-no">062</span><span id="line-62"> private static final String SCAN_IDENTIFIER_NAME = "_scan_id_";</span>
-<span class="source-line-no">063</span><span id="line-63"> private static final byte[] SCAN_IDENTIFIER = Bytes.toBytes("_scan_id_");</span>
-<span class="source-line-no">064</span><span id="line-64"> private static final Scan SCAN = new Scan().setAttribute(SCAN_IDENTIFIER_NAME, SCAN_IDENTIFIER);</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> private static volatile boolean SHOULD_THROW = false;</span>
-<span class="source-line-no">067</span><span id="line-67"> private static final AtomicBoolean EXCEPTION_THROWN = new AtomicBoolean(false);</span>
-<span class="source-line-no">068</span><span id="line-68"> private static final AtomicBoolean SCAN_SEEN = new AtomicBoolean(false);</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70"> private static Connection CONN;</span>
-<span class="source-line-no">071</span><span id="line-71"> private static Table TABLE;</span>
-<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73"> @BeforeClass</span>
-<span class="source-line-no">074</span><span id="line-74"> public static void setUp() throws Exception {</span>
-<span class="source-line-no">075</span><span id="line-75"> StartTestingClusterOption option =</span>
-<span class="source-line-no">076</span><span id="line-76"> StartTestingClusterOption.builder().rsClass(MockedQuotaManagerRegionServer.class).build();</span>
-<span class="source-line-no">077</span><span id="line-77"> UTIL.startMiniCluster(option);</span>
-<span class="source-line-no">078</span><span id="line-78"> UTIL.getAdmin().createTable(TableDescriptorBuilder.newBuilder(TABLE_NAME)</span>
-<span class="source-line-no">079</span><span id="line-79"> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM)).build());</span>
-<span class="source-line-no">080</span><span id="line-80"> Configuration conf = new Configuration(UTIL.getConfiguration());</span>
-<span class="source-line-no">081</span><span id="line-81"> CONN = ConnectionFactory.createConnection(conf);</span>
-<span class="source-line-no">082</span><span id="line-82"> TABLE = CONN.getTable(TABLE_NAME);</span>
-<span class="source-line-no">083</span><span id="line-83"> UTIL.loadTable(TABLE, FAM);</span>
-<span class="source-line-no">084</span><span id="line-84"> }</span>
-<span class="source-line-no">085</span><span id="line-85"></span>
-<span class="source-line-no">086</span><span id="line-86"> @AfterClass</span>
-<span class="source-line-no">087</span><span id="line-87"> public static void tearDown() throws Exception {</span>
-<span class="source-line-no">088</span><span id="line-88"> try {</span>
-<span class="source-line-no">089</span><span id="line-89"> TABLE.close();</span>
-<span class="source-line-no">090</span><span id="line-90"> } catch (Exception ignore) {</span>
-<span class="source-line-no">091</span><span id="line-91"> }</span>
-<span class="source-line-no">092</span><span id="line-92"> try {</span>
-<span class="source-line-no">093</span><span id="line-93"> CONN.close();</span>
-<span class="source-line-no">094</span><span id="line-94"> } catch (Exception ignore) {</span>
-<span class="source-line-no">095</span><span id="line-95"> }</span>
-<span class="source-line-no">096</span><span id="line-96"> UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">097</span><span id="line-97"> }</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99"> @Before</span>
-<span class="source-line-no">100</span><span id="line-100"> public void before() {</span>
-<span class="source-line-no">101</span><span id="line-101"> SHOULD_THROW = false;</span>
-<span class="source-line-no">102</span><span id="line-102"> SCAN_SEEN.set(false);</span>
-<span class="source-line-no">103</span><span id="line-103"> EXCEPTION_THROWN.set(false);</span>
-<span class="source-line-no">104</span><span id="line-104"> }</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106"> @Test</span>
-<span class="source-line-no">107</span><span id="line-107"> public void itIncreasesScannerCount() throws Exception {</span>
-<span class="source-line-no">108</span><span id="line-108"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
-<span class="source-line-no">109</span><span id="line-109"> // We need to wait until the scan and lease are created server-side.</span>
-<span class="source-line-no">110</span><span id="line-110"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
-<span class="source-line-no">111</span><span id="line-111"> UTIL.waitFor(1000, () -> SCAN_SEEN.get() && !EXCEPTION_THROWN.get());</span>
-<span class="source-line-no">112</span><span id="line-112"> }</span>
-<span class="source-line-no">113</span><span id="line-113"> }</span>
-<span class="source-line-no">114</span><span id="line-114"></span>
-<span class="source-line-no">115</span><span id="line-115"> @Test</span>
-<span class="source-line-no">116</span><span id="line-116"> public void itDoesNotIncreaseScannerLeaseCount() throws Exception {</span>
-<span class="source-line-no">117</span><span id="line-117"> SHOULD_THROW = true;</span>
-<span class="source-line-no">118</span><span id="line-118"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
-<span class="source-line-no">119</span><span id="line-119"> // We need to wait until the scan and lease are created server-side.</span>
-<span class="source-line-no">120</span><span id="line-120"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
-<span class="source-line-no">121</span><span id="line-121"> UTIL.waitFor(1000, () -> !SCAN_SEEN.get() && EXCEPTION_THROWN.get());</span>
-<span class="source-line-no">122</span><span id="line-122"> }</span>
-<span class="source-line-no">123</span><span id="line-123"> }</span>
-<span class="source-line-no">124</span><span id="line-124"></span>
-<span class="source-line-no">125</span><span id="line-125"> public static final class MockedQuotaManagerRegionServer</span>
-<span class="source-line-no">126</span><span id="line-126"> extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {</span>
-<span class="source-line-no">127</span><span id="line-127"> private final MockedRpcQuotaManager rpcQuotaManager;</span>
-<span class="source-line-no">128</span><span id="line-128"></span>
-<span class="source-line-no">129</span><span id="line-129"> public MockedQuotaManagerRegionServer(Configuration conf)</span>
-<span class="source-line-no">130</span><span id="line-130"> throws IOException, InterruptedException {</span>
-<span class="source-line-no">131</span><span id="line-131"> super(conf);</span>
-<span class="source-line-no">132</span><span id="line-132"> this.rpcQuotaManager = new MockedRpcQuotaManager(this);</span>
+<span class="source-line-no">050</span><span id="line-50">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">051</span><span id="line-51">@Tag(ClientTests.TAG)</span>
+<span class="source-line-no">052</span><span id="line-52">public class TestScannerLeaseCount {</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">055</span><span id="line-55"> private static final TableName TABLE_NAME = TableName.valueOf("ScannerLeaseCount");</span>
+<span class="source-line-no">056</span><span id="line-56"> private static final byte[] FAM = Bytes.toBytes("Fam");</span>
+<span class="source-line-no">057</span><span id="line-57"> private static final String SCAN_IDENTIFIER_NAME = "_scan_id_";</span>
+<span class="source-line-no">058</span><span id="line-58"> private static final byte[] SCAN_IDENTIFIER = Bytes.toBytes("_scan_id_");</span>
+<span class="source-line-no">059</span><span id="line-59"> private static final Scan SCAN = new Scan().setAttribute(SCAN_IDENTIFIER_NAME, SCAN_IDENTIFIER);</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61"> private static volatile boolean SHOULD_THROW = false;</span>
+<span class="source-line-no">062</span><span id="line-62"> private static final AtomicBoolean EXCEPTION_THROWN = new AtomicBoolean(false);</span>
+<span class="source-line-no">063</span><span id="line-63"> private static final AtomicBoolean SCAN_SEEN = new AtomicBoolean(false);</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65"> private static Connection CONN;</span>
+<span class="source-line-no">066</span><span id="line-66"> private static Table TABLE;</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68"> @BeforeAll</span>
+<span class="source-line-no">069</span><span id="line-69"> public static void setUp() throws Exception {</span>
+<span class="source-line-no">070</span><span id="line-70"> StartTestingClusterOption option =</span>
+<span class="source-line-no">071</span><span id="line-71"> StartTestingClusterOption.builder().rsClass(MockedQuotaManagerRegionServer.class).build();</span>
+<span class="source-line-no">072</span><span id="line-72"> UTIL.startMiniCluster(option);</span>
+<span class="source-line-no">073</span><span id="line-73"> UTIL.getAdmin().createTable(TableDescriptorBuilder.newBuilder(TABLE_NAME)</span>
+<span class="source-line-no">074</span><span id="line-74"> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAM)).build());</span>
+<span class="source-line-no">075</span><span id="line-75"> Configuration conf = new Configuration(UTIL.getConfiguration());</span>
+<span class="source-line-no">076</span><span id="line-76"> CONN = ConnectionFactory.createConnection(conf);</span>
+<span class="source-line-no">077</span><span id="line-77"> TABLE = CONN.getTable(TABLE_NAME);</span>
+<span class="source-line-no">078</span><span id="line-78"> UTIL.loadTable(TABLE, FAM);</span>
+<span class="source-line-no">079</span><span id="line-79"> }</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81"> @AfterAll</span>
+<span class="source-line-no">082</span><span id="line-82"> public static void tearDown() throws Exception {</span>
+<span class="source-line-no">083</span><span id="line-83"> try {</span>
+<span class="source-line-no">084</span><span id="line-84"> TABLE.close();</span>
+<span class="source-line-no">085</span><span id="line-85"> } catch (Exception ignore) {</span>
+<span class="source-line-no">086</span><span id="line-86"> }</span>
+<span class="source-line-no">087</span><span id="line-87"> try {</span>
+<span class="source-line-no">088</span><span id="line-88"> CONN.close();</span>
+<span class="source-line-no">089</span><span id="line-89"> } catch (Exception ignore) {</span>
+<span class="source-line-no">090</span><span id="line-90"> }</span>
+<span class="source-line-no">091</span><span id="line-91"> UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">092</span><span id="line-92"> }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94"> @BeforeEach</span>
+<span class="source-line-no">095</span><span id="line-95"> public void before() {</span>
+<span class="source-line-no">096</span><span id="line-96"> SHOULD_THROW = false;</span>
+<span class="source-line-no">097</span><span id="line-97"> SCAN_SEEN.set(false);</span>
+<span class="source-line-no">098</span><span id="line-98"> EXCEPTION_THROWN.set(false);</span>
+<span class="source-line-no">099</span><span id="line-99"> }</span>
+<span class="source-line-no">100</span><span id="line-100"></span>
+<span class="source-line-no">101</span><span id="line-101"> @Test</span>
+<span class="source-line-no">102</span><span id="line-102"> public void itIncreasesScannerCount() throws Exception {</span>
+<span class="source-line-no">103</span><span id="line-103"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
+<span class="source-line-no">104</span><span id="line-104"> // We need to wait until the scan and lease are created server-side.</span>
+<span class="source-line-no">105</span><span id="line-105"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
+<span class="source-line-no">106</span><span id="line-106"> UTIL.waitFor(1000, () -> SCAN_SEEN.get() && !EXCEPTION_THROWN.get());</span>
+<span class="source-line-no">107</span><span id="line-107"> }</span>
+<span class="source-line-no">108</span><span id="line-108"> }</span>
+<span class="source-line-no">109</span><span id="line-109"></span>
+<span class="source-line-no">110</span><span id="line-110"> @Test</span>
+<span class="source-line-no">111</span><span id="line-111"> public void itDoesNotIncreaseScannerLeaseCount() throws Exception {</span>
+<span class="source-line-no">112</span><span id="line-112"> SHOULD_THROW = true;</span>
+<span class="source-line-no">113</span><span id="line-113"> try (ResultScanner ignore = TABLE.getScanner(SCAN)) {</span>
+<span class="source-line-no">114</span><span id="line-114"> // We need to wait until the scan and lease are created server-side.</span>
+<span class="source-line-no">115</span><span id="line-115"> // Otherwise, our scanner counting will not reflect the new scan that was created</span>
+<span class="source-line-no">116</span><span id="line-116"> UTIL.waitFor(1000, () -> !SCAN_SEEN.get() && EXCEPTION_THROWN.get());</span>
+<span class="source-line-no">117</span><span id="line-117"> }</span>
+<span class="source-line-no">118</span><span id="line-118"> }</span>
+<span class="source-line-no">119</span><span id="line-119"></span>
+<span class="source-line-no">120</span><span id="line-120"> public static final class MockedQuotaManagerRegionServer</span>
+<span class="source-line-no">121</span><span id="line-121"> extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {</span>
+<span class="source-line-no">122</span><span id="line-122"> private final MockedRpcQuotaManager rpcQuotaManager;</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124"> public MockedQuotaManagerRegionServer(Configuration conf)</span>
+<span class="source-line-no">125</span><span id="line-125"> throws IOException, InterruptedException {</span>
+<span class="source-line-no">126</span><span id="line-126"> super(conf);</span>
+<span class="source-line-no">127</span><span id="line-127"> this.rpcQuotaManager = new MockedRpcQuotaManager(this);</span>
+<span class="source-line-no">128</span><span id="line-128"> }</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130"> @Override</span>
+<span class="source-line-no">131</span><span id="line-131"> public RegionServerRpcQuotaManager getRegionServerRpcQuotaManager() {</span>
+<span class="source-line-no">132</span><span id="line-132"> return rpcQuotaManager;</span>
<span class="source-line-no">133</span><span id="line-133"> }</span>
<span class="source-line-no">134</span><span id="line-134"></span>
<span class="source-line-no">135</span><span id="line-135"> @Override</span>
-<span class="source-line-no">136</span><span id="line-136"> public RegionServerRpcQuotaManager getRegionServerRpcQuotaManager() {</span>
-<span class="source-line-no">137</span><span id="line-137"> return rpcQuotaManager;</span>
+<span class="source-line-no">136</span><span id="line-136"> protected RSRpcServices createRpcServices() throws IOException {</span>
+<span class="source-line-no">137</span><span id="line-137"> return new ScannerTrackingRSRpcServicesForTest(this);</span>
<span class="source-line-no">138</span><span id="line-138"> }</span>
-<span class="source-line-no">139</span><span id="line-139"></span>
-<span class="source-line-no">140</span><span id="line-140"> @Override</span>
-<span class="source-line-no">141</span><span id="line-141"> protected RSRpcServices createRpcServices() throws IOException {</span>
-<span class="source-line-no">142</span><span id="line-142"> return new ScannerTrackingRSRpcServicesForTest(this);</span>
-<span class="source-line-no">143</span><span id="line-143"> }</span>
-<span class="source-line-no">144</span><span id="line-144"> }</span>
-<span class="source-line-no">145</span><span id="line-145"></span>
-<span class="source-line-no">146</span><span id="line-146"> private static class MockedRpcQuotaManager extends RegionServerRpcQuotaManager {</span>
-<span class="source-line-no">147</span><span id="line-147"> private static final RpcThrottlingException EX = new RpcThrottlingException("test_ex");</span>
-<span class="source-line-no">148</span><span id="line-148"></span>
-<span class="source-line-no">149</span><span id="line-149"> public MockedRpcQuotaManager(RegionServerServices rsServices) {</span>
-<span class="source-line-no">150</span><span id="line-150"> super(rsServices);</span>
-<span class="source-line-no">151</span><span id="line-151"> }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> @Override</span>
-<span class="source-line-no">154</span><span id="line-154"> public OperationQuota checkScanQuota(Region region, ClientProtos.ScanRequest scanRequest,</span>
-<span class="source-line-no">155</span><span id="line-155"> long maxScannerResultSize, long maxBlockBytesScanned, long prevBlockBytesScannedDifference)</span>
-<span class="source-line-no">156</span><span id="line-156"> throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">157</span><span id="line-157"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">158</span><span id="line-158"> if (isTestScan(scanRequest)) {</span>
-<span class="source-line-no">159</span><span id="line-159"> EXCEPTION_THROWN.set(true);</span>
-<span class="source-line-no">160</span><span id="line-160"> }</span>
-<span class="source-line-no">161</span><span id="line-161"> throw EX;</span>
-<span class="source-line-no">162</span><span id="line-162"> }</span>
-<span class="source-line-no">163</span><span id="line-163"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">164</span><span id="line-164"> }</span>
-<span class="source-line-no">165</span><span id="line-165"></span>
-<span class="source-line-no">166</span><span id="line-166"> @Override</span>
-<span class="source-line-no">167</span><span id="line-167"> public OperationQuota checkBatchQuota(Region region, OperationQuota.OperationType type)</span>
-<span class="source-line-no">168</span><span id="line-168"> throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">169</span><span id="line-169"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">170</span><span id="line-170"> throw EX;</span>
-<span class="source-line-no">171</span><span id="line-171"> }</span>
-<span class="source-line-no">172</span><span id="line-172"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">173</span><span id="line-173"> }</span>
-<span class="source-line-no">174</span><span id="line-174"></span>
-<span class="source-line-no">175</span><span id="line-175"> @Override</span>
-<span class="source-line-no">176</span><span id="line-176"> public OperationQuota checkBatchQuota(Region region, List<ClientProtos.Action> actions,</span>
-<span class="source-line-no">177</span><span id="line-177"> boolean hasCondition) throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">178</span><span id="line-178"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">179</span><span id="line-179"> throw EX;</span>
-<span class="source-line-no">180</span><span id="line-180"> }</span>
-<span class="source-line-no">181</span><span id="line-181"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">182</span><span id="line-182"> }</span>
-<span class="source-line-no">183</span><span id="line-183"></span>
-<span class="source-line-no">184</span><span id="line-184"> @Override</span>
-<span class="source-line-no">185</span><span id="line-185"> public OperationQuota checkBatchQuota(Region region, int numWrites, int numReads,</span>
-<span class="source-line-no">186</span><span id="line-186"> boolean isAtomic) throws IOException, RpcThrottlingException {</span>
-<span class="source-line-no">187</span><span id="line-187"> if (SHOULD_THROW) {</span>
-<span class="source-line-no">188</span><span id="line-188"> throw EX;</span>
-<span class="source-line-no">189</span><span id="line-189"> }</span>
-<span class="source-line-no">190</span><span id="line-190"> return TestNoopOperationQuota.INSTANCE;</span>
-<span class="source-line-no">191</span><span id="line-191"> }</span>
-<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">139</span><span id="line-139"> }</span>
+<span class="source-line-no">140</span><span id="line-140"></span>
+<span class="source-line-no">141</span><span id="line-141"> private static class MockedRpcQuotaManager extends RegionServerRpcQuotaManager {</span>
+<span class="source-line-no">142</span><span id="line-142"> private static final RpcThrottlingException EX = new RpcThrottlingException("test_ex");</span>
+<span class="source-line-no">143</span><span id="line-143"></span>
+<span class="source-line-no">144</span><span id="line-144"> public MockedRpcQuotaManager(RegionServerServices rsServices) {</span>
+<span class="source-line-no">145</span><span id="line-145"> super(rsServices);</span>
+<span class="source-line-no">146</span><span id="line-146"> }</span>
+<span class="source-line-no">147</span><span id="line-147"></span>
+<span class="source-line-no">148</span><span id="line-148"> @Override</span>
+<span class="source-line-no">149</span><span id="line-149"> public OperationQuota checkScanQuota(Region region, ClientProtos.ScanRequest scanRequest,</span>
+<span class="source-line-no">150</span><span id="line-150"> long maxScannerResultSize, long maxBlockBytesScanned, long prevBlockBytesScannedDifference)</span>
+<span class="source-line-no">151</span><span id="line-151"> throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">152</span><span id="line-152"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">153</span><span id="line-153"> if (isTestScan(scanRequest)) {</span>
+<span class="source-line-no">154</span><span id="line-154"> EXCEPTION_THROWN.set(true);</span>
+<span class="source-line-no">155</span><span id="line-155"> }</span>
+<span class="source-line-no">156</span><span id="line-156"> throw EX;</span>
+<span class="source-line-no">157</span><span id="line-157"> }</span>
+<span class="source-line-no">158</span><span id="line-158"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">159</span><span id="line-159"> }</span>
+<span class="source-line-no">160</span><span id="line-160"></span>
+<span class="source-line-no">161</span><span id="line-161"> @Override</span>
+<span class="source-line-no">162</span><span id="line-162"> public OperationQuota checkBatchQuota(Region region, OperationQuota.OperationType type)</span>
+<span class="source-line-no">163</span><span id="line-163"> throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">164</span><span id="line-164"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">165</span><span id="line-165"> throw EX;</span>
+<span class="source-line-no">166</span><span id="line-166"> }</span>
+<span class="source-line-no">167</span><span id="line-167"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">168</span><span id="line-168"> }</span>
+<span class="source-line-no">169</span><span id="line-169"></span>
+<span class="source-line-no">170</span><span id="line-170"> @Override</span>
+<span class="source-line-no">171</span><span id="line-171"> public OperationQuota checkBatchQuota(Region region, List<ClientProtos.Action> actions,</span>
+<span class="source-line-no">172</span><span id="line-172"> boolean hasCondition) throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">173</span><span id="line-173"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">174</span><span id="line-174"> throw EX;</span>
+<span class="source-line-no">175</span><span id="line-175"> }</span>
+<span class="source-line-no">176</span><span id="line-176"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">177</span><span id="line-177"> }</span>
+<span class="source-line-no">178</span><span id="line-178"></span>
+<span class="source-line-no">179</span><span id="line-179"> @Override</span>
+<span class="source-line-no">180</span><span id="line-180"> public OperationQuota checkBatchQuota(Region region, int numWrites, int numReads,</span>
+<span class="source-line-no">181</span><span id="line-181"> boolean isAtomic) throws IOException, RpcThrottlingException {</span>
+<span class="source-line-no">182</span><span id="line-182"> if (SHOULD_THROW) {</span>
+<span class="source-line-no">183</span><span id="line-183"> throw EX;</span>
+<span class="source-line-no">184</span><span id="line-184"> }</span>
+<span class="source-line-no">185</span><span id="line-185"> return TestNoopOperationQuota.INSTANCE;</span>
+<span class="source-line-no">186</span><span id="line-186"> }</span>
+<span class="source-line-no">187</span><span id="line-187"> }</span>
+<span class="source-line-no">188</span><span id="line-188"></span>
+<span class="source-line-no">189</span><span id="line-189"> private static class ScannerTrackingRSRpcServicesForTest extends RSRpcServices {</span>
+<span class="source-line-no">190</span><span id="line-190"> public ScannerTrackingRSRpcServicesForTest(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">191</span><span id="line-191"> super(rs);</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
<span class="source-line-no">193</span><span id="line-193"></span>
-<span class="source-line-no">194</span><span id="line-194"> private static class ScannerTrackingRSRpcServicesForTest extends RSRpcServices {</span>
-<span class="source-line-no">195</span><span id="line-195"> public ScannerTrackingRSRpcServicesForTest(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">196</span><span id="line-196"> super(rs);</span>
-<span class="source-line-no">197</span><span id="line-197"> }</span>
-<span class="source-line-no">198</span><span id="line-198"></span>
-<span class="source-line-no">199</span><span id="line-199"> @Override</span>
-<span class="source-line-no">200</span><span id="line-200"> RegionScannerContext checkQuotaAndGetRegionScannerContext(ClientProtos.ScanRequest request,</span>
-<span class="source-line-no">201</span><span id="line-201"> ClientProtos.ScanResponse.Builder builder) throws IOException {</span>
-<span class="source-line-no">202</span><span id="line-202"> RegionScannerContext rsx = super.checkQuotaAndGetRegionScannerContext(request, builder);</span>
-<span class="source-line-no">203</span><span id="line-203"> if (isTestScan(request)) {</span>
-<span class="source-line-no">204</span><span id="line-204"> SCAN_SEEN.set(true);</span>
-<span class="source-line-no">205</span><span id="line-205"> }</span>
-<span class="source-line-no">206</span><span id="line-206"> return rsx;</span>
-<span class="source-line-no">207</span><span id="line-207"> }</span>
-<span class="source-line-no">208</span><span id="line-208"> }</span>
-<span class="source-line-no">209</span><span id="line-209"></span>
-<span class="source-line-no">210</span><span id="line-210"> private static boolean isTestScan(ClientProtos.ScanRequest request) {</span>
-<span class="source-line-no">211</span><span id="line-211"> ClientProtos.Scan scan = request.getScan();</span>
-<span class="source-line-no">212</span><span id="line-212"> return scan.getAttributeList().stream()</span>
-<span class="source-line-no">213</span><span id="line-213"> .anyMatch(nbp -> nbp.getName().equals(SCAN_IDENTIFIER_NAME)</span>
-<span class="source-line-no">214</span><span id="line-214"> && Bytes.equals(nbp.getValue().toByteArray(), SCAN_IDENTIFIER));</span>
-<span class="source-line-no">215</span><span id="line-215"> }</span>
-<span class="source-line-no">216</span><span id="line-216">}</span>
+<span class="source-line-no">194</span><span id="line-194"> @Override</span>
+<span class="source-line-no">195</span><span id="line-195"> RegionScannerContext checkQuotaAndGetRegionScannerContext(ClientProtos.ScanRequest request,</span>
+<span class="source-line-no">196</span><span id="line-196"> ClientProtos.ScanResponse.Builder builder) throws IOException {</span>
+<span class="source-line-no">197</span><span id="line-197"> RegionScannerContext rsx = super.checkQuotaAndGetRegionScannerContext(request, builder);</span>
+<span class="source-line-no">198</span><span id="line-198"> if (isTestScan(request)) {</span>
+<span class="source-line-no">199</span><span id="line-199"> SCAN_SEEN.set(true);</span>
+<span class="source-line-no">200</span><span id="line-200"> }</span>
+<span class="source-line-no">201</span><span id="line-201"> return rsx;</span>
+<span class="source-line-no">202</span><span id="line-202"> }</span>
+<span class="source-line-no">203</span><span id="line-203"> }</span>
+<span class="source-line-no">204</span><span id="line-204"></span>
+<span class="source-line-no">205</span><span id="line-205"> private static boolean isTestScan(ClientProtos.ScanRequest request) {</span>
+<span class="source-line-no">206</span><span id="line-206"> ClientProtos.Scan scan = request.getScan();</span>
+<span class="source-line-no">207</span><span id="line-207"> return scan.getAttributeList().stream()</span>
+<span class="source-line-no">208</span><span id="line-208"> .anyMatch(nbp -> nbp.getName().equals(SCAN_IDENTIFIER_NAME)</span>
+<span class="source-line-no">209</span><span id="line-209"> && Bytes.equals(nbp.getValue().toByteArray(), SCAN_IDENTIFIER));</span>
+<span class="source-line-no">210</span><span id="line-210"> }</span>
+<span class="source-line-no">211</span><span id="line-211">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html
index d297d3e0160..103b858c011 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRPCScanMetrics.html
@@ -30,143 +30,134 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static org.junit.Assert.assertEquals;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
<span class="source-line-no">021</span><span id="line-21"></span>
<span class="source-line-no">022</span><span id="line-22">import java.io.IOException;</span>
<span class="source-line-no">023</span><span id="line-23">import org.apache.hadoop.conf.Configuration;</span>
-<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.SingleProcessHBaseCluster.MiniHBaseClusterRegionServer;</span>
-<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.junit.AfterClass;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.junit.BeforeClass;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.junit.ClassRule;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.junit.Rule;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.junit.Test;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.junit.rules.TestName;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.slf4j.Logger;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">046</span><span id="line-46"></span>
-<span class="source-line-no">047</span><span id="line-47">@Category({ RegionServerTests.class, MediumTests.class })</span>
-<span class="source-line-no">048</span><span id="line-48">public class TestScannerRPCScanMetrics {</span>
-<span class="source-line-no">049</span><span id="line-49"></span>
-<span class="source-line-no">050</span><span id="line-50"> @ClassRule</span>
-<span class="source-line-no">051</span><span id="line-51"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">052</span><span id="line-52"> HBaseClassTestRule.forClass(TestScannerRPCScanMetrics.class);</span>
+<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.SingleProcessHBaseCluster.MiniHBaseClusterRegionServer;</span>
+<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.junit.jupiter.api.TestInfo;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.slf4j.Logger;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">045</span><span id="line-45">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">046</span><span id="line-46">public class TestScannerRPCScanMetrics {</span>
+<span class="source-line-no">047</span><span id="line-47"></span>
+<span class="source-line-no">048</span><span id="line-48"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerRPCScanMetrics.class);</span>
+<span class="source-line-no">049</span><span id="line-49"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">050</span><span id="line-50"> private static final byte[] FAMILY = Bytes.toBytes("testFamily");</span>
+<span class="source-line-no">051</span><span id="line-51"> private static final byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
+<span class="source-line-no">052</span><span id="line-52"> private static final byte[] VALUE = Bytes.toBytes("testValue");</span>
<span class="source-line-no">053</span><span id="line-53"></span>
-<span class="source-line-no">054</span><span id="line-54"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerRPCScanMetrics.class);</span>
-<span class="source-line-no">055</span><span id="line-55"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">056</span><span id="line-56"> private static final byte[] FAMILY = Bytes.toBytes("testFamily");</span>
-<span class="source-line-no">057</span><span id="line-57"> private static final byte[] QUALIFIER = Bytes.toBytes("testQualifier");</span>
-<span class="source-line-no">058</span><span id="line-58"> private static final byte[] VALUE = Bytes.toBytes("testValue");</span>
-<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60"> @Rule</span>
-<span class="source-line-no">061</span><span id="line-61"> public TestName name = new TestName();</span>
-<span class="source-line-no">062</span><span id="line-62"></span>
-<span class="source-line-no">063</span><span id="line-63"> @BeforeClass</span>
-<span class="source-line-no">064</span><span id="line-64"> public static void setupBeforeClass() throws Exception {</span>
-<span class="source-line-no">065</span><span id="line-65"> Configuration conf = TEST_UTIL.getConfiguration();</span>
-<span class="source-line-no">066</span><span id="line-66"> conf.setStrings(HConstants.REGION_SERVER_IMPL, RegionServerWithScanMetrics.class.getName());</span>
-<span class="source-line-no">067</span><span id="line-67"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">068</span><span id="line-68"> }</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70"> @AfterClass</span>
-<span class="source-line-no">071</span><span id="line-71"> public static void tearDownAfterClass() throws Exception {</span>
-<span class="source-line-no">072</span><span id="line-72"> TEST_UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">073</span><span id="line-73"> }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75"> @Test</span>
-<span class="source-line-no">076</span><span id="line-76"> public void testScannerRPCScanMetrics() throws Exception {</span>
-<span class="source-line-no">077</span><span id="line-77"> final TableName tableName = TableName.valueOf(name.getMethodName());</span>
-<span class="source-line-no">078</span><span id="line-78"> byte[][] splits = new byte[1][];</span>
-<span class="source-line-no">079</span><span id="line-79"> splits[0] = Bytes.toBytes("row-4");</span>
-<span class="source-line-no">080</span><span id="line-80"> Table ht = TEST_UTIL.createTable(tableName, FAMILY, splits);</span>
-<span class="source-line-no">081</span><span id="line-81"> byte[] r0 = Bytes.toBytes("row-0");</span>
-<span class="source-line-no">082</span><span id="line-82"> byte[] r1 = Bytes.toBytes("row-1");</span>
-<span class="source-line-no">083</span><span id="line-83"> byte[] r2 = Bytes.toBytes("row-2");</span>
-<span class="source-line-no">084</span><span id="line-84"> byte[] r3 = Bytes.toBytes("row-3");</span>
-<span class="source-line-no">085</span><span id="line-85"> putToTable(ht, r0);</span>
-<span class="source-line-no">086</span><span id="line-86"> putToTable(ht, r1);</span>
-<span class="source-line-no">087</span><span id="line-87"> putToTable(ht, r2);</span>
-<span class="source-line-no">088</span><span id="line-88"> putToTable(ht, r3);</span>
-<span class="source-line-no">089</span><span id="line-89"> LOG.info("Wrote our four table entries");</span>
-<span class="source-line-no">090</span><span id="line-90"> Scan scan1 = new Scan();</span>
-<span class="source-line-no">091</span><span id="line-91"> scan1.withStartRow(r0);</span>
-<span class="source-line-no">092</span><span id="line-92"> // This scan should not increment rpc full scan count (start row specified)</span>
-<span class="source-line-no">093</span><span id="line-93"> scan1.withStopRow(Bytes.toBytes("row-4"));</span>
-<span class="source-line-no">094</span><span id="line-94"> scanNextIterate(ht, scan1);</span>
-<span class="source-line-no">095</span><span id="line-95"> Scan scan2 = new Scan();</span>
-<span class="source-line-no">096</span><span id="line-96"> scan2.withStartRow(r1);</span>
-<span class="source-line-no">097</span><span id="line-97"> // This scan should increment rpc full scan count by 1 (for second region only)</span>
-<span class="source-line-no">098</span><span id="line-98"> scanNextIterate(ht, scan2);</span>
-<span class="source-line-no">099</span><span id="line-99"> Scan scan3 = new Scan();</span>
-<span class="source-line-no">100</span><span id="line-100"> scan3.withStopRow(Bytes.toBytes("row-5"));</span>
-<span class="source-line-no">101</span><span id="line-101"> // This scan should increment rpc full scan count by 1 (for firts region only)</span>
-<span class="source-line-no">102</span><span id="line-102"> scanNextIterate(ht, scan3);</span>
-<span class="source-line-no">103</span><span id="line-103"> Scan scan4 = new Scan();</span>
-<span class="source-line-no">104</span><span id="line-104"> scan4.withStartRow(r1);</span>
-<span class="source-line-no">105</span><span id="line-105"> scan4.withStopRow(r2);</span>
-<span class="source-line-no">106</span><span id="line-106"> // This scan should not increment rpc full scan count (both start and stop row)</span>
-<span class="source-line-no">107</span><span id="line-107"> scanNextIterate(ht, scan4);</span>
-<span class="source-line-no">108</span><span id="line-108"> Scan dummyScan = new Scan();</span>
-<span class="source-line-no">109</span><span id="line-109"> // This scan should increment rpc full scan count by 2 (both regions - no stop/start row)</span>
-<span class="source-line-no">110</span><span id="line-110"> scanNextIterate(ht, dummyScan);</span>
-<span class="source-line-no">111</span><span id="line-111"></span>
-<span class="source-line-no">112</span><span id="line-112"> RSRpcServices testClusterRSRPCServices =</span>
-<span class="source-line-no">113</span><span id="line-113"> TEST_UTIL.getMiniHBaseCluster().getRegionServer(0).getRpcServices();</span>
-<span class="source-line-no">114</span><span id="line-114"> assertEquals(4, testClusterRSRPCServices.rpcFullScanRequestCount.intValue());</span>
-<span class="source-line-no">115</span><span id="line-115"> }</span>
-<span class="source-line-no">116</span><span id="line-116"></span>
-<span class="source-line-no">117</span><span id="line-117"> private void putToTable(Table ht, byte[] rowkey) throws IOException {</span>
-<span class="source-line-no">118</span><span id="line-118"> Put put = new Put(rowkey);</span>
-<span class="source-line-no">119</span><span id="line-119"> put.addColumn(FAMILY, QUALIFIER, VALUE);</span>
-<span class="source-line-no">120</span><span id="line-120"> ht.put(put);</span>
-<span class="source-line-no">121</span><span id="line-121"> }</span>
-<span class="source-line-no">122</span><span id="line-122"></span>
-<span class="source-line-no">123</span><span id="line-123"> private void scanNextIterate(Table ht, Scan scan) throws Exception {</span>
-<span class="source-line-no">124</span><span id="line-124"> ResultScanner scanner = ht.getScanner(scan);</span>
-<span class="source-line-no">125</span><span id="line-125"> for (Result result = scanner.next(); result != null; result = scanner.next()) {</span>
-<span class="source-line-no">126</span><span id="line-126"> // Use the result object</span>
-<span class="source-line-no">127</span><span id="line-127"> }</span>
-<span class="source-line-no">128</span><span id="line-128"> scanner.close();</span>
-<span class="source-line-no">129</span><span id="line-129"> }</span>
-<span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131"> private static class RegionServerWithScanMetrics extends MiniHBaseClusterRegionServer {</span>
-<span class="source-line-no">132</span><span id="line-132"> public RegionServerWithScanMetrics(Configuration conf)</span>
-<span class="source-line-no">133</span><span id="line-133"> throws IOException, InterruptedException {</span>
-<span class="source-line-no">134</span><span id="line-134"> super(conf);</span>
-<span class="source-line-no">135</span><span id="line-135"> }</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137"> protected RSRpcServices createRPCServices() throws IOException {</span>
-<span class="source-line-no">138</span><span id="line-138"> return new RSRPCServicesWithScanMetrics(this);</span>
-<span class="source-line-no">139</span><span id="line-139"> }</span>
-<span class="source-line-no">140</span><span id="line-140"> }</span>
+<span class="source-line-no">054</span><span id="line-54"> @BeforeAll</span>
+<span class="source-line-no">055</span><span id="line-55"> public static void setupBeforeClass() throws Exception {</span>
+<span class="source-line-no">056</span><span id="line-56"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">057</span><span id="line-57"> conf.setStrings(HConstants.REGION_SERVER_IMPL, RegionServerWithScanMetrics.class.getName());</span>
+<span class="source-line-no">058</span><span id="line-58"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">059</span><span id="line-59"> }</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61"> @AfterAll</span>
+<span class="source-line-no">062</span><span id="line-62"> public static void tearDownAfterClass() throws Exception {</span>
+<span class="source-line-no">063</span><span id="line-63"> TEST_UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">064</span><span id="line-64"> }</span>
+<span class="source-line-no">065</span><span id="line-65"></span>
+<span class="source-line-no">066</span><span id="line-66"> @Test</span>
+<span class="source-line-no">067</span><span id="line-67"> public void testScannerRPCScanMetrics(TestInfo testInfo) throws Exception {</span>
+<span class="source-line-no">068</span><span id="line-68"> final TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());</span>
+<span class="source-line-no">069</span><span id="line-69"> byte[][] splits = new byte[1][];</span>
+<span class="source-line-no">070</span><span id="line-70"> splits[0] = Bytes.toBytes("row-4");</span>
+<span class="source-line-no">071</span><span id="line-71"> Table ht = TEST_UTIL.createTable(tableName, FAMILY, splits);</span>
+<span class="source-line-no">072</span><span id="line-72"> byte[] r0 = Bytes.toBytes("row-0");</span>
+<span class="source-line-no">073</span><span id="line-73"> byte[] r1 = Bytes.toBytes("row-1");</span>
+<span class="source-line-no">074</span><span id="line-74"> byte[] r2 = Bytes.toBytes("row-2");</span>
+<span class="source-line-no">075</span><span id="line-75"> byte[] r3 = Bytes.toBytes("row-3");</span>
+<span class="source-line-no">076</span><span id="line-76"> putToTable(ht, r0);</span>
+<span class="source-line-no">077</span><span id="line-77"> putToTable(ht, r1);</span>
+<span class="source-line-no">078</span><span id="line-78"> putToTable(ht, r2);</span>
+<span class="source-line-no">079</span><span id="line-79"> putToTable(ht, r3);</span>
+<span class="source-line-no">080</span><span id="line-80"> LOG.info("Wrote our four table entries");</span>
+<span class="source-line-no">081</span><span id="line-81"> Scan scan1 = new Scan();</span>
+<span class="source-line-no">082</span><span id="line-82"> scan1.withStartRow(r0);</span>
+<span class="source-line-no">083</span><span id="line-83"> // This scan should not increment rpc full scan count (start row specified)</span>
+<span class="source-line-no">084</span><span id="line-84"> scan1.withStopRow(Bytes.toBytes("row-4"));</span>
+<span class="source-line-no">085</span><span id="line-85"> scanNextIterate(ht, scan1);</span>
+<span class="source-line-no">086</span><span id="line-86"> Scan scan2 = new Scan();</span>
+<span class="source-line-no">087</span><span id="line-87"> scan2.withStartRow(r1);</span>
+<span class="source-line-no">088</span><span id="line-88"> // This scan should increment rpc full scan count by 1 (for second region only)</span>
+<span class="source-line-no">089</span><span id="line-89"> scanNextIterate(ht, scan2);</span>
+<span class="source-line-no">090</span><span id="line-90"> Scan scan3 = new Scan();</span>
+<span class="source-line-no">091</span><span id="line-91"> scan3.withStopRow(Bytes.toBytes("row-5"));</span>
+<span class="source-line-no">092</span><span id="line-92"> // This scan should increment rpc full scan count by 1 (for firts region only)</span>
+<span class="source-line-no">093</span><span id="line-93"> scanNextIterate(ht, scan3);</span>
+<span class="source-line-no">094</span><span id="line-94"> Scan scan4 = new Scan();</span>
+<span class="source-line-no">095</span><span id="line-95"> scan4.withStartRow(r1);</span>
+<span class="source-line-no">096</span><span id="line-96"> scan4.withStopRow(r2);</span>
+<span class="source-line-no">097</span><span id="line-97"> // This scan should not increment rpc full scan count (both start and stop row)</span>
+<span class="source-line-no">098</span><span id="line-98"> scanNextIterate(ht, scan4);</span>
+<span class="source-line-no">099</span><span id="line-99"> Scan dummyScan = new Scan();</span>
+<span class="source-line-no">100</span><span id="line-100"> // This scan should increment rpc full scan count by 2 (both regions - no stop/start row)</span>
+<span class="source-line-no">101</span><span id="line-101"> scanNextIterate(ht, dummyScan);</span>
+<span class="source-line-no">102</span><span id="line-102"></span>
+<span class="source-line-no">103</span><span id="line-103"> RSRpcServices testClusterRSRPCServices =</span>
+<span class="source-line-no">104</span><span id="line-104"> TEST_UTIL.getMiniHBaseCluster().getRegionServer(0).getRpcServices();</span>
+<span class="source-line-no">105</span><span id="line-105"> assertEquals(4, testClusterRSRPCServices.rpcFullScanRequestCount.intValue());</span>
+<span class="source-line-no">106</span><span id="line-106"> }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108"> private void putToTable(Table ht, byte[] rowkey) throws IOException {</span>
+<span class="source-line-no">109</span><span id="line-109"> Put put = new Put(rowkey);</span>
+<span class="source-line-no">110</span><span id="line-110"> put.addColumn(FAMILY, QUALIFIER, VALUE);</span>
+<span class="source-line-no">111</span><span id="line-111"> ht.put(put);</span>
+<span class="source-line-no">112</span><span id="line-112"> }</span>
+<span class="source-line-no">113</span><span id="line-113"></span>
+<span class="source-line-no">114</span><span id="line-114"> private void scanNextIterate(Table ht, Scan scan) throws Exception {</span>
+<span class="source-line-no">115</span><span id="line-115"> ResultScanner scanner = ht.getScanner(scan);</span>
+<span class="source-line-no">116</span><span id="line-116"> for (Result result = scanner.next(); result != null; result = scanner.next()) {</span>
+<span class="source-line-no">117</span><span id="line-117"> // Use the result object</span>
+<span class="source-line-no">118</span><span id="line-118"> }</span>
+<span class="source-line-no">119</span><span id="line-119"> scanner.close();</span>
+<span class="source-line-no">120</span><span id="line-120"> }</span>
+<span class="source-line-no">121</span><span id="line-121"></span>
+<span class="source-line-no">122</span><span id="line-122"> private static class RegionServerWithScanMetrics extends MiniHBaseClusterRegionServer {</span>
+<span class="source-line-no">123</span><span id="line-123"> public RegionServerWithScanMetrics(Configuration conf)</span>
+<span class="source-line-no">124</span><span id="line-124"> throws IOException, InterruptedException {</span>
+<span class="source-line-no">125</span><span id="line-125"> super(conf);</span>
+<span class="source-line-no">126</span><span id="line-126"> }</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128"> protected RSRpcServices createRPCServices() throws IOException {</span>
+<span class="source-line-no">129</span><span id="line-129"> return new RSRPCServicesWithScanMetrics(this);</span>
+<span class="source-line-no">130</span><span id="line-130"> }</span>
+<span class="source-line-no">131</span><span id="line-131"> }</span>
+<span class="source-line-no">132</span><span id="line-132"></span>
+<span class="source-line-no">133</span><span id="line-133"> private static class RSRPCServicesWithScanMetrics extends RSRpcServices {</span>
+<span class="source-line-no">134</span><span id="line-134"> public long getScanRequestCount() {</span>
+<span class="source-line-no">135</span><span id="line-135"> return super.rpcScanRequestCount.longValue();</span>
+<span class="source-line-no">136</span><span id="line-136"> }</span>
+<span class="source-line-no">137</span><span id="line-137"></span>
+<span class="source-line-no">138</span><span id="line-138"> public long getFullScanRequestCount() {</span>
+<span class="source-line-no">139</span><span id="line-139"> return super.rpcFullScanRequestCount.longValue();</span>
+<span class="source-line-no">140</span><span id="line-140"> }</span>
<span class="source-line-no">141</span><span id="line-141"></span>
-<span class="source-line-no">142</span><span id="line-142"> private static class RSRPCServicesWithScanMetrics extends RSRpcServices {</span>
-<span class="source-line-no">143</span><span id="line-143"> public long getScanRequestCount() {</span>
-<span class="source-line-no">144</span><span id="line-144"> return super.rpcScanRequestCount.longValue();</span>
-<span class="source-line-no">145</span><span id="line-145"> }</span>
+<span class="source-line-no">142</span><span id="line-142"> public RSRPCServicesWithScanMetrics(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">143</span><span id="line-143"> super(rs);</span>
+<span class="source-line-no">144</span><span id="line-144"> }</span>
+<span class="source-line-no">145</span><span id="line-145"> }</span>
<span class="source-line-no">146</span><span id="line-146"></span>
-<span class="source-line-no">147</span><span id="line-147"> public long getFullScanRequestCount() {</span>
-<span class="source-line-no">148</span><span id="line-148"> return super.rpcFullScanRequestCount.longValue();</span>
-<span class="source-line-no">149</span><span id="line-149"> }</span>
-<span class="source-line-no">150</span><span id="line-150"></span>
-<span class="source-line-no">151</span><span id="line-151"> public RSRPCServicesWithScanMetrics(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">152</span><span id="line-152"> super(rs);</span>
-<span class="source-line-no">153</span><span id="line-153"> }</span>
-<span class="source-line-no">154</span><span id="line-154"> }</span>
-<span class="source-line-no">155</span><span id="line-155"></span>
-<span class="source-line-no">156</span><span id="line-156">}</span>
+<span class="source-line-no">147</span><span id="line-147">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
index 99040177b23..e205d49b0c9 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.FaultyScannerObserver.html
@@ -30,8 +30,8 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertTrue;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
<span class="source-line-no">022</span><span id="line-22"></span>
<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
<span class="source-line-no">024</span><span id="line-24">import java.util.ArrayList;</span>
@@ -40,155 +40,146 @@
<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.conf.Configuration;</span>
<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.fs.FileSystem;</span>
<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.fs.Path;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.TableNameTestRule;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Durability;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.coprocessor.ObserverContext;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.coprocessor.RegionObserver;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.junit.AfterClass;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.junit.BeforeClass;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.junit.ClassRule;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.junit.Rule;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.Test;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.slf4j.Logger;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">056</span><span id="line-56"></span>
-<span class="source-line-no">057</span><span id="line-57">@Category({ RegionServerTests.class, MediumTests.class })</span>
-<span class="source-line-no">058</span><span id="line-58">public class TestScannerRetriableFailure {</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Durability;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.coprocessor.ObserverContext;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.coprocessor.RegionObserver;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.junit.jupiter.api.TestInfo;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.slf4j.Logger;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">055</span><span id="line-55">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">056</span><span id="line-56">public class TestScannerRetriableFailure {</span>
+<span class="source-line-no">057</span><span id="line-57"></span>
+<span class="source-line-no">058</span><span id="line-58"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerRetriableFailure.class);</span>
<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60"> @ClassRule</span>
-<span class="source-line-no">061</span><span id="line-61"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">062</span><span id="line-62"> HBaseClassTestRule.forClass(TestScannerRetriableFailure.class);</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerRetriableFailure.class);</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">060</span><span id="line-60"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">061</span><span id="line-61"></span>
+<span class="source-line-no">062</span><span id="line-62"> private static final String FAMILY_NAME_STR = "f";</span>
+<span class="source-line-no">063</span><span id="line-63"> private static final byte[] FAMILY_NAME = Bytes.toBytes(FAMILY_NAME_STR);</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65"> public static class FaultyScannerObserver implements RegionCoprocessor, RegionObserver {</span>
+<span class="source-line-no">066</span><span id="line-66"> private int faults = 0;</span>
<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68"> private static final String FAMILY_NAME_STR = "f";</span>
-<span class="source-line-no">069</span><span id="line-69"> private static final byte[] FAMILY_NAME = Bytes.toBytes(FAMILY_NAME_STR);</span>
-<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71"> @Rule</span>
-<span class="source-line-no">072</span><span id="line-72"> public TableNameTestRule testTable = new TableNameTestRule();</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74"> public static class FaultyScannerObserver implements RegionCoprocessor, RegionObserver {</span>
-<span class="source-line-no">075</span><span id="line-75"> private int faults = 0;</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77"> @Override</span>
-<span class="source-line-no">078</span><span id="line-78"> public Optional<RegionObserver> getRegionObserver() {</span>
-<span class="source-line-no">079</span><span id="line-79"> return Optional.of(this);</span>
-<span class="source-line-no">080</span><span id="line-80"> }</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82"> @Override</span>
-<span class="source-line-no">083</span><span id="line-83"> public boolean preScannerNext(final ObserverContext<? extends RegionCoprocessorEnvironment> e,</span>
-<span class="source-line-no">084</span><span id="line-84"> final InternalScanner s, final List<Result> results, final int limit, final boolean hasMore)</span>
-<span class="source-line-no">085</span><span id="line-85"> throws IOException {</span>
-<span class="source-line-no">086</span><span id="line-86"> final TableName tableName = e.getEnvironment().getRegionInfo().getTable();</span>
-<span class="source-line-no">087</span><span id="line-87"> if (!tableName.isSystemTable() && (faults++ % 2) == 0) {</span>
-<span class="source-line-no">088</span><span id="line-88"> LOG.debug(" Injecting fault in table=" + tableName + " scanner");</span>
-<span class="source-line-no">089</span><span id="line-89"> throw new IOException("injected fault");</span>
-<span class="source-line-no">090</span><span id="line-90"> }</span>
-<span class="source-line-no">091</span><span id="line-91"> return hasMore;</span>
-<span class="source-line-no">092</span><span id="line-92"> }</span>
-<span class="source-line-no">093</span><span id="line-93"> }</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95"> private static void setupConf(Configuration conf) {</span>
-<span class="source-line-no">096</span><span id="line-96"> conf.setLong("hbase.hstore.compaction.min", 20);</span>
-<span class="source-line-no">097</span><span id="line-97"> conf.setLong("hbase.hstore.compaction.max", 39);</span>
-<span class="source-line-no">098</span><span id="line-98"> conf.setLong("hbase.hstore.blockingStoreFiles", 40);</span>
+<span class="source-line-no">068</span><span id="line-68"> @Override</span>
+<span class="source-line-no">069</span><span id="line-69"> public Optional<RegionObserver> getRegionObserver() {</span>
+<span class="source-line-no">070</span><span id="line-70"> return Optional.of(this);</span>
+<span class="source-line-no">071</span><span id="line-71"> }</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73"> @Override</span>
+<span class="source-line-no">074</span><span id="line-74"> public boolean preScannerNext(final ObserverContext<? extends RegionCoprocessorEnvironment> e,</span>
+<span class="source-line-no">075</span><span id="line-75"> final InternalScanner s, final List<Result> results, final int limit, final boolean hasMore)</span>
+<span class="source-line-no">076</span><span id="line-76"> throws IOException {</span>
+<span class="source-line-no">077</span><span id="line-77"> final TableName tableName = e.getEnvironment().getRegionInfo().getTable();</span>
+<span class="source-line-no">078</span><span id="line-78"> if (!tableName.isSystemTable() && (faults++ % 2) == 0) {</span>
+<span class="source-line-no">079</span><span id="line-79"> LOG.debug(" Injecting fault in table=" + tableName + " scanner");</span>
+<span class="source-line-no">080</span><span id="line-80"> throw new IOException("injected fault");</span>
+<span class="source-line-no">081</span><span id="line-81"> }</span>
+<span class="source-line-no">082</span><span id="line-82"> return hasMore;</span>
+<span class="source-line-no">083</span><span id="line-83"> }</span>
+<span class="source-line-no">084</span><span id="line-84"> }</span>
+<span class="source-line-no">085</span><span id="line-85"></span>
+<span class="source-line-no">086</span><span id="line-86"> private static void setupConf(Configuration conf) {</span>
+<span class="source-line-no">087</span><span id="line-87"> conf.setLong("hbase.hstore.compaction.min", 20);</span>
+<span class="source-line-no">088</span><span id="line-88"> conf.setLong("hbase.hstore.compaction.max", 39);</span>
+<span class="source-line-no">089</span><span id="line-89"> conf.setLong("hbase.hstore.blockingStoreFiles", 40);</span>
+<span class="source-line-no">090</span><span id="line-90"></span>
+<span class="source-line-no">091</span><span id="line-91"> conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, FaultyScannerObserver.class.getName());</span>
+<span class="source-line-no">092</span><span id="line-92"> }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94"> @BeforeAll</span>
+<span class="source-line-no">095</span><span id="line-95"> public static void setup() throws Exception {</span>
+<span class="source-line-no">096</span><span id="line-96"> setupConf(UTIL.getConfiguration());</span>
+<span class="source-line-no">097</span><span id="line-97"> UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">098</span><span id="line-98"> }</span>
<span class="source-line-no">099</span><span id="line-99"></span>
-<span class="source-line-no">100</span><span id="line-100"> conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, FaultyScannerObserver.class.getName());</span>
-<span class="source-line-no">101</span><span id="line-101"> }</span>
-<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103"> @BeforeClass</span>
-<span class="source-line-no">104</span><span id="line-104"> public static void setup() throws Exception {</span>
-<span class="source-line-no">105</span><span id="line-105"> setupConf(UTIL.getConfiguration());</span>
-<span class="source-line-no">106</span><span id="line-106"> UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">100</span><span id="line-100"> @AfterAll</span>
+<span class="source-line-no">101</span><span id="line-101"> public static void tearDown() throws Exception {</span>
+<span class="source-line-no">102</span><span id="line-102"> try {</span>
+<span class="source-line-no">103</span><span id="line-103"> UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">104</span><span id="line-104"> } catch (Exception e) {</span>
+<span class="source-line-no">105</span><span id="line-105"> LOG.warn("failure shutting down cluster", e);</span>
+<span class="source-line-no">106</span><span id="line-106"> }</span>
<span class="source-line-no">107</span><span id="line-107"> }</span>
<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109"> @AfterClass</span>
-<span class="source-line-no">110</span><span id="line-110"> public static void tearDown() throws Exception {</span>
-<span class="source-line-no">111</span><span id="line-111"> try {</span>
-<span class="source-line-no">112</span><span id="line-112"> UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">113</span><span id="line-113"> } catch (Exception e) {</span>
-<span class="source-line-no">114</span><span id="line-114"> LOG.warn("failure shutting down cluster", e);</span>
-<span class="source-line-no">115</span><span id="line-115"> }</span>
-<span class="source-line-no">116</span><span id="line-116"> }</span>
-<span class="source-line-no">117</span><span id="line-117"></span>
-<span class="source-line-no">118</span><span id="line-118"> @Test</span>
-<span class="source-line-no">119</span><span id="line-119"> public void testFaultyScanner() throws Exception {</span>
-<span class="source-line-no">120</span><span id="line-120"> TableName tableName = testTable.getTableName();</span>
-<span class="source-line-no">121</span><span id="line-121"> Table table = UTIL.createTable(tableName, FAMILY_NAME);</span>
-<span class="source-line-no">122</span><span id="line-122"> try {</span>
-<span class="source-line-no">123</span><span id="line-123"> final int NUM_ROWS = 100;</span>
-<span class="source-line-no">124</span><span id="line-124"> loadTable(table, NUM_ROWS);</span>
-<span class="source-line-no">125</span><span id="line-125"> checkTableRows(table, NUM_ROWS);</span>
-<span class="source-line-no">126</span><span id="line-126"> } finally {</span>
-<span class="source-line-no">127</span><span id="line-127"> table.close();</span>
-<span class="source-line-no">128</span><span id="line-128"> }</span>
-<span class="source-line-no">129</span><span id="line-129"> }</span>
-<span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131"> // ==========================================================================</span>
-<span class="source-line-no">132</span><span id="line-132"> // Helpers</span>
-<span class="source-line-no">133</span><span id="line-133"> // ==========================================================================</span>
-<span class="source-line-no">134</span><span id="line-134"> private FileSystem getFileSystem() {</span>
-<span class="source-line-no">135</span><span id="line-135"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();</span>
-<span class="source-line-no">136</span><span id="line-136"> }</span>
-<span class="source-line-no">137</span><span id="line-137"></span>
-<span class="source-line-no">138</span><span id="line-138"> private Path getRootDir() {</span>
-<span class="source-line-no">139</span><span id="line-139"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();</span>
-<span class="source-line-no">140</span><span id="line-140"> }</span>
-<span class="source-line-no">141</span><span id="line-141"></span>
-<span class="source-line-no">142</span><span id="line-142"> public void loadTable(final Table table, int numRows) throws IOException {</span>
-<span class="source-line-no">143</span><span id="line-143"> List<Put> puts = new ArrayList<>(numRows);</span>
-<span class="source-line-no">144</span><span id="line-144"> for (int i = 0; i < numRows; ++i) {</span>
-<span class="source-line-no">145</span><span id="line-145"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
-<span class="source-line-no">146</span><span id="line-146"> Put put = new Put(row);</span>
-<span class="source-line-no">147</span><span id="line-147"> put.setDurability(Durability.SKIP_WAL);</span>
-<span class="source-line-no">148</span><span id="line-148"> put.addColumn(FAMILY_NAME, null, row);</span>
-<span class="source-line-no">149</span><span id="line-149"> table.put(put);</span>
-<span class="source-line-no">150</span><span id="line-150"> }</span>
-<span class="source-line-no">151</span><span id="line-151"> }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> private void checkTableRows(final Table table, int numRows) throws Exception {</span>
-<span class="source-line-no">154</span><span id="line-154"> Scan scan = new Scan();</span>
-<span class="source-line-no">155</span><span id="line-155"> scan.setCaching(1);</span>
-<span class="source-line-no">156</span><span id="line-156"> scan.setCacheBlocks(false);</span>
-<span class="source-line-no">157</span><span id="line-157"> ResultScanner scanner = table.getScanner(scan);</span>
-<span class="source-line-no">158</span><span id="line-158"> try {</span>
-<span class="source-line-no">159</span><span id="line-159"> int count = 0;</span>
-<span class="source-line-no">160</span><span id="line-160"> for (int i = 0; i < numRows; ++i) {</span>
-<span class="source-line-no">161</span><span id="line-161"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
-<span class="source-line-no">162</span><span id="line-162"> Result result = scanner.next();</span>
-<span class="source-line-no">163</span><span id="line-163"> assertTrue(result != null);</span>
-<span class="source-line-no">164</span><span id="line-164"> assertTrue(Bytes.equals(row, result.getRow()));</span>
-<span class="source-line-no">165</span><span id="line-165"> count++;</span>
-<span class="source-line-no">166</span><span id="line-166"> }</span>
-<span class="source-line-no">167</span><span id="line-167"></span>
-<span class="source-line-no">168</span><span id="line-168"> while (true) {</span>
-<span class="source-line-no">169</span><span id="line-169"> Result result = scanner.next();</span>
-<span class="source-line-no">170</span><span id="line-170"> if (result == null) break;</span>
-<span class="source-line-no">171</span><span id="line-171"> count++;</span>
-<span class="source-line-no">172</span><span id="line-172"> }</span>
-<span class="source-line-no">173</span><span id="line-173"> assertEquals(numRows, count);</span>
-<span class="source-line-no">174</span><span id="line-174"> } finally {</span>
-<span class="source-line-no">175</span><span id="line-175"> scanner.close();</span>
-<span class="source-line-no">176</span><span id="line-176"> }</span>
-<span class="source-line-no">177</span><span id="line-177"> }</span>
-<span class="source-line-no">178</span><span id="line-178">}</span>
+<span class="source-line-no">109</span><span id="line-109"> @Test</span>
+<span class="source-line-no">110</span><span id="line-110"> public void testFaultyScanner(TestInfo testInfo) throws Exception {</span>
+<span class="source-line-no">111</span><span id="line-111"> TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());</span>
+<span class="source-line-no">112</span><span id="line-112"> Table table = UTIL.createTable(tableName, FAMILY_NAME);</span>
+<span class="source-line-no">113</span><span id="line-113"> try {</span>
+<span class="source-line-no">114</span><span id="line-114"> final int NUM_ROWS = 100;</span>
+<span class="source-line-no">115</span><span id="line-115"> loadTable(table, NUM_ROWS);</span>
+<span class="source-line-no">116</span><span id="line-116"> checkTableRows(table, NUM_ROWS);</span>
+<span class="source-line-no">117</span><span id="line-117"> } finally {</span>
+<span class="source-line-no">118</span><span id="line-118"> table.close();</span>
+<span class="source-line-no">119</span><span id="line-119"> }</span>
+<span class="source-line-no">120</span><span id="line-120"> }</span>
+<span class="source-line-no">121</span><span id="line-121"></span>
+<span class="source-line-no">122</span><span id="line-122"> // ==========================================================================</span>
+<span class="source-line-no">123</span><span id="line-123"> // Helpers</span>
+<span class="source-line-no">124</span><span id="line-124"> // ==========================================================================</span>
+<span class="source-line-no">125</span><span id="line-125"> private FileSystem getFileSystem() {</span>
+<span class="source-line-no">126</span><span id="line-126"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();</span>
+<span class="source-line-no">127</span><span id="line-127"> }</span>
+<span class="source-line-no">128</span><span id="line-128"></span>
+<span class="source-line-no">129</span><span id="line-129"> private Path getRootDir() {</span>
+<span class="source-line-no">130</span><span id="line-130"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();</span>
+<span class="source-line-no">131</span><span id="line-131"> }</span>
+<span class="source-line-no">132</span><span id="line-132"></span>
+<span class="source-line-no">133</span><span id="line-133"> public void loadTable(final Table table, int numRows) throws IOException {</span>
+<span class="source-line-no">134</span><span id="line-134"> List<Put> puts = new ArrayList<>(numRows);</span>
+<span class="source-line-no">135</span><span id="line-135"> for (int i = 0; i < numRows; ++i) {</span>
+<span class="source-line-no">136</span><span id="line-136"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
+<span class="source-line-no">137</span><span id="line-137"> Put put = new Put(row);</span>
+<span class="source-line-no">138</span><span id="line-138"> put.setDurability(Durability.SKIP_WAL);</span>
+<span class="source-line-no">139</span><span id="line-139"> put.addColumn(FAMILY_NAME, null, row);</span>
+<span class="source-line-no">140</span><span id="line-140"> table.put(put);</span>
+<span class="source-line-no">141</span><span id="line-141"> }</span>
+<span class="source-line-no">142</span><span id="line-142"> }</span>
+<span class="source-line-no">143</span><span id="line-143"></span>
+<span class="source-line-no">144</span><span id="line-144"> private void checkTableRows(final Table table, int numRows) throws Exception {</span>
+<span class="source-line-no">145</span><span id="line-145"> Scan scan = new Scan();</span>
+<span class="source-line-no">146</span><span id="line-146"> scan.setCaching(1);</span>
+<span class="source-line-no">147</span><span id="line-147"> scan.setCacheBlocks(false);</span>
+<span class="source-line-no">148</span><span id="line-148"> ResultScanner scanner = table.getScanner(scan);</span>
+<span class="source-line-no">149</span><span id="line-149"> try {</span>
+<span class="source-line-no">150</span><span id="line-150"> int count = 0;</span>
+<span class="source-line-no">151</span><span id="line-151"> for (int i = 0; i < numRows; ++i) {</span>
+<span class="source-line-no">152</span><span id="line-152"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
+<span class="source-line-no">153</span><span id="line-153"> Result result = scanner.next();</span>
+<span class="source-line-no">154</span><span id="line-154"> assertTrue(result != null);</span>
+<span class="source-line-no">155</span><span id="line-155"> assertTrue(Bytes.equals(row, result.getRow()));</span>
+<span class="source-line-no">156</span><span id="line-156"> count++;</span>
+<span class="source-line-no">157</span><span id="line-157"> }</span>
+<span class="source-line-no">158</span><span id="line-158"></span>
+<span class="source-line-no">159</span><span id="line-159"> while (true) {</span>
+<span class="source-line-no">160</span><span id="line-160"> Result result = scanner.next();</span>
+<span class="source-line-no">161</span><span id="line-161"> if (result == null) break;</span>
+<span class="source-line-no">162</span><span id="line-162"> count++;</span>
+<span class="source-line-no">163</span><span id="line-163"> }</span>
+<span class="source-line-no">164</span><span id="line-164"> assertEquals(numRows, count);</span>
+<span class="source-line-no">165</span><span id="line-165"> } finally {</span>
+<span class="source-line-no">166</span><span id="line-166"> scanner.close();</span>
+<span class="source-line-no">167</span><span id="line-167"> }</span>
+<span class="source-line-no">168</span><span id="line-168"> }</span>
+<span class="source-line-no">169</span><span id="line-169">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
index 1c135964b84..377953376be 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerRetriableFailure.html
@@ -30,8 +30,8 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertTrue;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
<span class="source-line-no">022</span><span id="line-22"></span>
<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
<span class="source-line-no">024</span><span id="line-24">import java.util.ArrayList;</span>
@@ -40,155 +40,146 @@
<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.conf.Configuration;</span>
<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.fs.FileSystem;</span>
<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.fs.Path;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.TableNameTestRule;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Durability;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.coprocessor.ObserverContext;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.coprocessor.RegionObserver;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.junit.AfterClass;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.junit.BeforeClass;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.junit.ClassRule;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.junit.Rule;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.Test;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.slf4j.Logger;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">056</span><span id="line-56"></span>
-<span class="source-line-no">057</span><span id="line-57">@Category({ RegionServerTests.class, MediumTests.class })</span>
-<span class="source-line-no">058</span><span id="line-58">public class TestScannerRetriableFailure {</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Durability;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.coprocessor.ObserverContext;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.coprocessor.RegionObserver;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.junit.jupiter.api.TestInfo;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.slf4j.Logger;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">055</span><span id="line-55">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">056</span><span id="line-56">public class TestScannerRetriableFailure {</span>
+<span class="source-line-no">057</span><span id="line-57"></span>
+<span class="source-line-no">058</span><span id="line-58"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerRetriableFailure.class);</span>
<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60"> @ClassRule</span>
-<span class="source-line-no">061</span><span id="line-61"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">062</span><span id="line-62"> HBaseClassTestRule.forClass(TestScannerRetriableFailure.class);</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerRetriableFailure.class);</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">060</span><span id="line-60"> private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">061</span><span id="line-61"></span>
+<span class="source-line-no">062</span><span id="line-62"> private static final String FAMILY_NAME_STR = "f";</span>
+<span class="source-line-no">063</span><span id="line-63"> private static final byte[] FAMILY_NAME = Bytes.toBytes(FAMILY_NAME_STR);</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65"> public static class FaultyScannerObserver implements RegionCoprocessor, RegionObserver {</span>
+<span class="source-line-no">066</span><span id="line-66"> private int faults = 0;</span>
<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68"> private static final String FAMILY_NAME_STR = "f";</span>
-<span class="source-line-no">069</span><span id="line-69"> private static final byte[] FAMILY_NAME = Bytes.toBytes(FAMILY_NAME_STR);</span>
-<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71"> @Rule</span>
-<span class="source-line-no">072</span><span id="line-72"> public TableNameTestRule testTable = new TableNameTestRule();</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74"> public static class FaultyScannerObserver implements RegionCoprocessor, RegionObserver {</span>
-<span class="source-line-no">075</span><span id="line-75"> private int faults = 0;</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77"> @Override</span>
-<span class="source-line-no">078</span><span id="line-78"> public Optional<RegionObserver> getRegionObserver() {</span>
-<span class="source-line-no">079</span><span id="line-79"> return Optional.of(this);</span>
-<span class="source-line-no">080</span><span id="line-80"> }</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82"> @Override</span>
-<span class="source-line-no">083</span><span id="line-83"> public boolean preScannerNext(final ObserverContext<? extends RegionCoprocessorEnvironment> e,</span>
-<span class="source-line-no">084</span><span id="line-84"> final InternalScanner s, final List<Result> results, final int limit, final boolean hasMore)</span>
-<span class="source-line-no">085</span><span id="line-85"> throws IOException {</span>
-<span class="source-line-no">086</span><span id="line-86"> final TableName tableName = e.getEnvironment().getRegionInfo().getTable();</span>
-<span class="source-line-no">087</span><span id="line-87"> if (!tableName.isSystemTable() && (faults++ % 2) == 0) {</span>
-<span class="source-line-no">088</span><span id="line-88"> LOG.debug(" Injecting fault in table=" + tableName + " scanner");</span>
-<span class="source-line-no">089</span><span id="line-89"> throw new IOException("injected fault");</span>
-<span class="source-line-no">090</span><span id="line-90"> }</span>
-<span class="source-line-no">091</span><span id="line-91"> return hasMore;</span>
-<span class="source-line-no">092</span><span id="line-92"> }</span>
-<span class="source-line-no">093</span><span id="line-93"> }</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95"> private static void setupConf(Configuration conf) {</span>
-<span class="source-line-no">096</span><span id="line-96"> conf.setLong("hbase.hstore.compaction.min", 20);</span>
-<span class="source-line-no">097</span><span id="line-97"> conf.setLong("hbase.hstore.compaction.max", 39);</span>
-<span class="source-line-no">098</span><span id="line-98"> conf.setLong("hbase.hstore.blockingStoreFiles", 40);</span>
+<span class="source-line-no">068</span><span id="line-68"> @Override</span>
+<span class="source-line-no">069</span><span id="line-69"> public Optional<RegionObserver> getRegionObserver() {</span>
+<span class="source-line-no">070</span><span id="line-70"> return Optional.of(this);</span>
+<span class="source-line-no">071</span><span id="line-71"> }</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73"> @Override</span>
+<span class="source-line-no">074</span><span id="line-74"> public boolean preScannerNext(final ObserverContext<? extends RegionCoprocessorEnvironment> e,</span>
+<span class="source-line-no">075</span><span id="line-75"> final InternalScanner s, final List<Result> results, final int limit, final boolean hasMore)</span>
+<span class="source-line-no">076</span><span id="line-76"> throws IOException {</span>
+<span class="source-line-no">077</span><span id="line-77"> final TableName tableName = e.getEnvironment().getRegionInfo().getTable();</span>
+<span class="source-line-no">078</span><span id="line-78"> if (!tableName.isSystemTable() && (faults++ % 2) == 0) {</span>
+<span class="source-line-no">079</span><span id="line-79"> LOG.debug(" Injecting fault in table=" + tableName + " scanner");</span>
+<span class="source-line-no">080</span><span id="line-80"> throw new IOException("injected fault");</span>
+<span class="source-line-no">081</span><span id="line-81"> }</span>
+<span class="source-line-no">082</span><span id="line-82"> return hasMore;</span>
+<span class="source-line-no">083</span><span id="line-83"> }</span>
+<span class="source-line-no">084</span><span id="line-84"> }</span>
+<span class="source-line-no">085</span><span id="line-85"></span>
+<span class="source-line-no">086</span><span id="line-86"> private static void setupConf(Configuration conf) {</span>
+<span class="source-line-no">087</span><span id="line-87"> conf.setLong("hbase.hstore.compaction.min", 20);</span>
+<span class="source-line-no">088</span><span id="line-88"> conf.setLong("hbase.hstore.compaction.max", 39);</span>
+<span class="source-line-no">089</span><span id="line-89"> conf.setLong("hbase.hstore.blockingStoreFiles", 40);</span>
+<span class="source-line-no">090</span><span id="line-90"></span>
+<span class="source-line-no">091</span><span id="line-91"> conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, FaultyScannerObserver.class.getName());</span>
+<span class="source-line-no">092</span><span id="line-92"> }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94"> @BeforeAll</span>
+<span class="source-line-no">095</span><span id="line-95"> public static void setup() throws Exception {</span>
+<span class="source-line-no">096</span><span id="line-96"> setupConf(UTIL.getConfiguration());</span>
+<span class="source-line-no">097</span><span id="line-97"> UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">098</span><span id="line-98"> }</span>
<span class="source-line-no">099</span><span id="line-99"></span>
-<span class="source-line-no">100</span><span id="line-100"> conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, FaultyScannerObserver.class.getName());</span>
-<span class="source-line-no">101</span><span id="line-101"> }</span>
-<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103"> @BeforeClass</span>
-<span class="source-line-no">104</span><span id="line-104"> public static void setup() throws Exception {</span>
-<span class="source-line-no">105</span><span id="line-105"> setupConf(UTIL.getConfiguration());</span>
-<span class="source-line-no">106</span><span id="line-106"> UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">100</span><span id="line-100"> @AfterAll</span>
+<span class="source-line-no">101</span><span id="line-101"> public static void tearDown() throws Exception {</span>
+<span class="source-line-no">102</span><span id="line-102"> try {</span>
+<span class="source-line-no">103</span><span id="line-103"> UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">104</span><span id="line-104"> } catch (Exception e) {</span>
+<span class="source-line-no">105</span><span id="line-105"> LOG.warn("failure shutting down cluster", e);</span>
+<span class="source-line-no">106</span><span id="line-106"> }</span>
<span class="source-line-no">107</span><span id="line-107"> }</span>
<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109"> @AfterClass</span>
-<span class="source-line-no">110</span><span id="line-110"> public static void tearDown() throws Exception {</span>
-<span class="source-line-no">111</span><span id="line-111"> try {</span>
-<span class="source-line-no">112</span><span id="line-112"> UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">113</span><span id="line-113"> } catch (Exception e) {</span>
-<span class="source-line-no">114</span><span id="line-114"> LOG.warn("failure shutting down cluster", e);</span>
-<span class="source-line-no">115</span><span id="line-115"> }</span>
-<span class="source-line-no">116</span><span id="line-116"> }</span>
-<span class="source-line-no">117</span><span id="line-117"></span>
-<span class="source-line-no">118</span><span id="line-118"> @Test</span>
-<span class="source-line-no">119</span><span id="line-119"> public void testFaultyScanner() throws Exception {</span>
-<span class="source-line-no">120</span><span id="line-120"> TableName tableName = testTable.getTableName();</span>
-<span class="source-line-no">121</span><span id="line-121"> Table table = UTIL.createTable(tableName, FAMILY_NAME);</span>
-<span class="source-line-no">122</span><span id="line-122"> try {</span>
-<span class="source-line-no">123</span><span id="line-123"> final int NUM_ROWS = 100;</span>
-<span class="source-line-no">124</span><span id="line-124"> loadTable(table, NUM_ROWS);</span>
-<span class="source-line-no">125</span><span id="line-125"> checkTableRows(table, NUM_ROWS);</span>
-<span class="source-line-no">126</span><span id="line-126"> } finally {</span>
-<span class="source-line-no">127</span><span id="line-127"> table.close();</span>
-<span class="source-line-no">128</span><span id="line-128"> }</span>
-<span class="source-line-no">129</span><span id="line-129"> }</span>
-<span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131"> // ==========================================================================</span>
-<span class="source-line-no">132</span><span id="line-132"> // Helpers</span>
-<span class="source-line-no">133</span><span id="line-133"> // ==========================================================================</span>
-<span class="source-line-no">134</span><span id="line-134"> private FileSystem getFileSystem() {</span>
-<span class="source-line-no">135</span><span id="line-135"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();</span>
-<span class="source-line-no">136</span><span id="line-136"> }</span>
-<span class="source-line-no">137</span><span id="line-137"></span>
-<span class="source-line-no">138</span><span id="line-138"> private Path getRootDir() {</span>
-<span class="source-line-no">139</span><span id="line-139"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();</span>
-<span class="source-line-no">140</span><span id="line-140"> }</span>
-<span class="source-line-no">141</span><span id="line-141"></span>
-<span class="source-line-no">142</span><span id="line-142"> public void loadTable(final Table table, int numRows) throws IOException {</span>
-<span class="source-line-no">143</span><span id="line-143"> List<Put> puts = new ArrayList<>(numRows);</span>
-<span class="source-line-no">144</span><span id="line-144"> for (int i = 0; i < numRows; ++i) {</span>
-<span class="source-line-no">145</span><span id="line-145"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
-<span class="source-line-no">146</span><span id="line-146"> Put put = new Put(row);</span>
-<span class="source-line-no">147</span><span id="line-147"> put.setDurability(Durability.SKIP_WAL);</span>
-<span class="source-line-no">148</span><span id="line-148"> put.addColumn(FAMILY_NAME, null, row);</span>
-<span class="source-line-no">149</span><span id="line-149"> table.put(put);</span>
-<span class="source-line-no">150</span><span id="line-150"> }</span>
-<span class="source-line-no">151</span><span id="line-151"> }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153"> private void checkTableRows(final Table table, int numRows) throws Exception {</span>
-<span class="source-line-no">154</span><span id="line-154"> Scan scan = new Scan();</span>
-<span class="source-line-no">155</span><span id="line-155"> scan.setCaching(1);</span>
-<span class="source-line-no">156</span><span id="line-156"> scan.setCacheBlocks(false);</span>
-<span class="source-line-no">157</span><span id="line-157"> ResultScanner scanner = table.getScanner(scan);</span>
-<span class="source-line-no">158</span><span id="line-158"> try {</span>
-<span class="source-line-no">159</span><span id="line-159"> int count = 0;</span>
-<span class="source-line-no">160</span><span id="line-160"> for (int i = 0; i < numRows; ++i) {</span>
-<span class="source-line-no">161</span><span id="line-161"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
-<span class="source-line-no">162</span><span id="line-162"> Result result = scanner.next();</span>
-<span class="source-line-no">163</span><span id="line-163"> assertTrue(result != null);</span>
-<span class="source-line-no">164</span><span id="line-164"> assertTrue(Bytes.equals(row, result.getRow()));</span>
-<span class="source-line-no">165</span><span id="line-165"> count++;</span>
-<span class="source-line-no">166</span><span id="line-166"> }</span>
-<span class="source-line-no">167</span><span id="line-167"></span>
-<span class="source-line-no">168</span><span id="line-168"> while (true) {</span>
-<span class="source-line-no">169</span><span id="line-169"> Result result = scanner.next();</span>
-<span class="source-line-no">170</span><span id="line-170"> if (result == null) break;</span>
-<span class="source-line-no">171</span><span id="line-171"> count++;</span>
-<span class="source-line-no">172</span><span id="line-172"> }</span>
-<span class="source-line-no">173</span><span id="line-173"> assertEquals(numRows, count);</span>
-<span class="source-line-no">174</span><span id="line-174"> } finally {</span>
-<span class="source-line-no">175</span><span id="line-175"> scanner.close();</span>
-<span class="source-line-no">176</span><span id="line-176"> }</span>
-<span class="source-line-no">177</span><span id="line-177"> }</span>
-<span class="source-line-no">178</span><span id="line-178">}</span>
+<span class="source-line-no">109</span><span id="line-109"> @Test</span>
+<span class="source-line-no">110</span><span id="line-110"> public void testFaultyScanner(TestInfo testInfo) throws Exception {</span>
+<span class="source-line-no">111</span><span id="line-111"> TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());</span>
+<span class="source-line-no">112</span><span id="line-112"> Table table = UTIL.createTable(tableName, FAMILY_NAME);</span>
+<span class="source-line-no">113</span><span id="line-113"> try {</span>
+<span class="source-line-no">114</span><span id="line-114"> final int NUM_ROWS = 100;</span>
+<span class="source-line-no">115</span><span id="line-115"> loadTable(table, NUM_ROWS);</span>
+<span class="source-line-no">116</span><span id="line-116"> checkTableRows(table, NUM_ROWS);</span>
+<span class="source-line-no">117</span><span id="line-117"> } finally {</span>
+<span class="source-line-no">118</span><span id="line-118"> table.close();</span>
+<span class="source-line-no">119</span><span id="line-119"> }</span>
+<span class="source-line-no">120</span><span id="line-120"> }</span>
+<span class="source-line-no">121</span><span id="line-121"></span>
+<span class="source-line-no">122</span><span id="line-122"> // ==========================================================================</span>
+<span class="source-line-no">123</span><span id="line-123"> // Helpers</span>
+<span class="source-line-no">124</span><span id="line-124"> // ==========================================================================</span>
+<span class="source-line-no">125</span><span id="line-125"> private FileSystem getFileSystem() {</span>
+<span class="source-line-no">126</span><span id="line-126"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();</span>
+<span class="source-line-no">127</span><span id="line-127"> }</span>
+<span class="source-line-no">128</span><span id="line-128"></span>
+<span class="source-line-no">129</span><span id="line-129"> private Path getRootDir() {</span>
+<span class="source-line-no">130</span><span id="line-130"> return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();</span>
+<span class="source-line-no">131</span><span id="line-131"> }</span>
+<span class="source-line-no">132</span><span id="line-132"></span>
+<span class="source-line-no">133</span><span id="line-133"> public void loadTable(final Table table, int numRows) throws IOException {</span>
+<span class="source-line-no">134</span><span id="line-134"> List<Put> puts = new ArrayList<>(numRows);</span>
+<span class="source-line-no">135</span><span id="line-135"> for (int i = 0; i < numRows; ++i) {</span>
+<span class="source-line-no">136</span><span id="line-136"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
+<span class="source-line-no">137</span><span id="line-137"> Put put = new Put(row);</span>
+<span class="source-line-no">138</span><span id="line-138"> put.setDurability(Durability.SKIP_WAL);</span>
+<span class="source-line-no">139</span><span id="line-139"> put.addColumn(FAMILY_NAME, null, row);</span>
+<span class="source-line-no">140</span><span id="line-140"> table.put(put);</span>
+<span class="source-line-no">141</span><span id="line-141"> }</span>
+<span class="source-line-no">142</span><span id="line-142"> }</span>
+<span class="source-line-no">143</span><span id="line-143"></span>
+<span class="source-line-no">144</span><span id="line-144"> private void checkTableRows(final Table table, int numRows) throws Exception {</span>
+<span class="source-line-no">145</span><span id="line-145"> Scan scan = new Scan();</span>
+<span class="source-line-no">146</span><span id="line-146"> scan.setCaching(1);</span>
+<span class="source-line-no">147</span><span id="line-147"> scan.setCacheBlocks(false);</span>
+<span class="source-line-no">148</span><span id="line-148"> ResultScanner scanner = table.getScanner(scan);</span>
+<span class="source-line-no">149</span><span id="line-149"> try {</span>
+<span class="source-line-no">150</span><span id="line-150"> int count = 0;</span>
+<span class="source-line-no">151</span><span id="line-151"> for (int i = 0; i < numRows; ++i) {</span>
+<span class="source-line-no">152</span><span id="line-152"> byte[] row = Bytes.toBytes(String.format("%09d", i));</span>
+<span class="source-line-no">153</span><span id="line-153"> Result result = scanner.next();</span>
+<span class="source-line-no">154</span><span id="line-154"> assertTrue(result != null);</span>
+<span class="source-line-no">155</span><span id="line-155"> assertTrue(Bytes.equals(row, result.getRow()));</span>
+<span class="source-line-no">156</span><span id="line-156"> count++;</span>
+<span class="source-line-no">157</span><span id="line-157"> }</span>
+<span class="source-line-no">158</span><span id="line-158"></span>
+<span class="source-line-no">159</span><span id="line-159"> while (true) {</span>
+<span class="source-line-no">160</span><span id="line-160"> Result result = scanner.next();</span>
+<span class="source-line-no">161</span><span id="line-161"> if (result == null) break;</span>
+<span class="source-line-no">162</span><span id="line-162"> count++;</span>
+<span class="source-line-no">163</span><span id="line-163"> }</span>
+<span class="source-line-no">164</span><span id="line-164"> assertEquals(numRows, count);</span>
+<span class="source-line-no">165</span><span id="line-165"> } finally {</span>
+<span class="source-line-no">166</span><span id="line-166"> scanner.close();</span>
+<span class="source-line-no">167</span><span id="line-167"> }</span>
+<span class="source-line-no">168</span><span id="line-168"> }</span>
+<span class="source-line-no">169</span><span id="line-169">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html
index 0e72d9f85c9..7d64d712110 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerTimeoutHandling.html
@@ -30,8 +30,8 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import static org.junit.Assert.assertEquals;</span>
-<span class="source-line-no">021</span><span id="line-21">import static org.junit.Assert.assertTrue;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">021</span><span id="line-21">import static org.junit.jupiter.api.Assertions.assertTrue;</span>
<span class="source-line-no">022</span><span id="line-22"></span>
<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
<span class="source-line-no">024</span><span id="line-24">import java.util.concurrent.TimeUnit;</span>
@@ -39,188 +39,177 @@
<span class="source-line-no">026</span><span id="line-26">import java.util.concurrent.locks.ReentrantLock;</span>
<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.conf.Configuration;</span>
<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.CompatibilityFactory;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.HConstants;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.SingleProcessHBaseCluster;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Connection;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.RetriesExhaustedException;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.exceptions.ScannerResetException;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.exceptions.TimeoutIOException;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.ipc.CallTimeoutException;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.test.MetricsAssertHelper;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.junit.AfterClass;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.junit.BeforeClass;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.junit.ClassRule;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.junit.Rule;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.Test;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.junit.rules.TestName;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.slf4j.Logger;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HConstants;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.SingleProcessHBaseCluster;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Connection;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.ConnectionFactory;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.RetriesExhaustedException;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.exceptions.ScannerResetException;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.exceptions.TimeoutIOException;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.ipc.CallTimeoutException;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.test.MetricsAssertHelper;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.slf4j.Logger;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54">import org.apache.hbase.thirdparty.com.google.protobuf.RpcController;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;</span>
+<span class="source-line-no">056</span><span id="line-56"></span>
+<span class="source-line-no">057</span><span id="line-57">import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">060</span><span id="line-60">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">061</span><span id="line-61">public class TestScannerTimeoutHandling {</span>
<span class="source-line-no">062</span><span id="line-62"></span>
-<span class="source-line-no">063</span><span id="line-63">@Category({ RegionServerTests.class, MediumTests.class })</span>
-<span class="source-line-no">064</span><span id="line-64">public class TestScannerTimeoutHandling {</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerTimeoutHandling.class);</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68"> @ClassRule</span>
-<span class="source-line-no">069</span><span id="line-69"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">070</span><span id="line-70"> HBaseClassTestRule.forClass(TestScannerTimeoutHandling.class);</span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72"> private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">073</span><span id="line-73"> private static final MetricsAssertHelper METRICS_ASSERT =</span>
-<span class="source-line-no">074</span><span id="line-74"> CompatibilityFactory.getInstance(MetricsAssertHelper.class);</span>
-<span class="source-line-no">075</span><span id="line-75"> private static final int TIMEOUT = 3000;</span>
-<span class="source-line-no">076</span><span id="line-76"> private static final TableName TABLE_NAME = TableName.valueOf("foo");</span>
-<span class="source-line-no">077</span><span id="line-77"> private static Connection CONN;</span>
-<span class="source-line-no">078</span><span id="line-78"></span>
-<span class="source-line-no">079</span><span id="line-79"> @Rule</span>
-<span class="source-line-no">080</span><span id="line-80"> public TestName name = new TestName();</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82"> @BeforeClass</span>
-<span class="source-line-no">083</span><span id="line-83"> public static void setUpBeforeClass() throws Exception {</span>
-<span class="source-line-no">084</span><span id="line-84"> Configuration conf = TEST_UTIL.getConfiguration();</span>
-<span class="source-line-no">085</span><span id="line-85"> // Don't report so often so easier to see other rpcs</span>
-<span class="source-line-no">086</span><span id="line-86"> conf.setInt("hbase.regionserver.msginterval", 3 * 10000);</span>
-<span class="source-line-no">087</span><span id="line-87"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, TIMEOUT);</span>
-<span class="source-line-no">088</span><span id="line-88"> // conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, TIMEOUT);</span>
-<span class="source-line-no">089</span><span id="line-89"> conf.setStrings(HConstants.REGION_SERVER_IMPL, RegionServerWithScanTimeout.class.getName());</span>
-<span class="source-line-no">090</span><span id="line-90"> conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 0);</span>
-<span class="source-line-no">091</span><span id="line-91"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">092</span><span id="line-92"> TEST_UTIL.createTable(TABLE_NAME, "0");</span>
-<span class="source-line-no">093</span><span id="line-93"></span>
-<span class="source-line-no">094</span><span id="line-94"> CONN = ConnectionFactory.createConnection(conf);</span>
-<span class="source-line-no">095</span><span id="line-95"> }</span>
-<span class="source-line-no">096</span><span id="line-96"></span>
-<span class="source-line-no">097</span><span id="line-97"> @AfterClass</span>
-<span class="source-line-no">098</span><span id="line-98"> public static void tearDownAfterClass() throws Exception {</span>
-<span class="source-line-no">099</span><span id="line-99"> CONN.close();</span>
-<span class="source-line-no">100</span><span id="line-100"> TEST_UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">101</span><span id="line-101"> }</span>
-<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103"> /**</span>
-<span class="source-line-no">104</span><span id="line-104"> * If a client's timeout would be exceeded before scan results are ready, there is no point</span>
-<span class="source-line-no">105</span><span id="line-105"> * returning results to the client. Worse, for openScanner calls, the client cannot close the</span>
-<span class="source-line-no">106</span><span id="line-106"> * timed out scanner so this leaks scanners on the server. This test verifies that we properly</span>
-<span class="source-line-no">107</span><span id="line-107"> * track and cleanup scanners when a client timeout is exceeded. This should be more rare when</span>
-<span class="source-line-no">108</span><span id="line-108"> * heartbeats are enabled, since we try to return before timeout there. But it's still possible if</span>
-<span class="source-line-no">109</span><span id="line-109"> * queueing eats up most of the timeout or the inner workings of the scan were slowed down enough</span>
-<span class="source-line-no">110</span><span id="line-110"> * to still exceed the timeout despite the calculated heartbeat deadline.</span>
-<span class="source-line-no">111</span><span id="line-111"> */</span>
-<span class="source-line-no">112</span><span id="line-112"> @Test</span>
-<span class="source-line-no">113</span><span id="line-113"> public void testExceededClientDeadline() throws Exception {</span>
-<span class="source-line-no">114</span><span id="line-114"> Table table = CONN.getTable(TABLE_NAME);</span>
-<span class="source-line-no">115</span><span id="line-115"></span>
-<span class="source-line-no">116</span><span id="line-116"> // put some rows so that our scanner doesn't complete on the first rpc.</span>
-<span class="source-line-no">117</span><span id="line-117"> // this would prematurely close the scanner before the timeout handling has a chance to</span>
-<span class="source-line-no">118</span><span id="line-118"> for (int i = 0; i < 10; i++) {</span>
-<span class="source-line-no">119</span><span id="line-119"> table.put(new Put(Bytes.toBytes(i)).addColumn(new byte[] { '0' }, new byte[] { '0' },</span>
-<span class="source-line-no">120</span><span id="line-120"> new byte[] { '0' }));</span>
-<span class="source-line-no">121</span><span id="line-121"> }</span>
-<span class="source-line-no">122</span><span id="line-122"></span>
-<span class="source-line-no">123</span><span id="line-123"> try {</span>
-<span class="source-line-no">124</span><span id="line-124"> ResultScanner scanner = table.getScanner(new Scan().setCaching(1).setMaxResultSize(1));</span>
-<span class="source-line-no">125</span><span id="line-125"> scanner.next();</span>
-<span class="source-line-no">126</span><span id="line-126"> } catch (RetriesExhaustedException e) {</span>
-<span class="source-line-no">127</span><span id="line-127"> assertTrue(e.getCause() instanceof CallTimeoutException);</span>
-<span class="source-line-no">128</span><span id="line-128"> } finally {</span>
-<span class="source-line-no">129</span><span id="line-129"> // ensure the scan has finished on the server side</span>
-<span class="source-line-no">130</span><span id="line-130"> RSRpcServicesWithScanTimeout.lock.tryLock(60, TimeUnit.SECONDS);</span>
-<span class="source-line-no">131</span><span id="line-131"> // there should be 0 running scanners, meaning the scanner was properly closed on the server</span>
-<span class="source-line-no">132</span><span id="line-132"> assertEquals(0, RSRpcServicesWithScanTimeout.scannerCount);</span>
-<span class="source-line-no">133</span><span id="line-133"> // we should have caught the expected exception</span>
-<span class="source-line-no">134</span><span id="line-134"> assertTrue(RSRpcServicesWithScanTimeout.caughtTimeoutException);</span>
-<span class="source-line-no">135</span><span id="line-135"> // we should have incremented the callTimedOut metric</span>
-<span class="source-line-no">136</span><span id="line-136"> METRICS_ASSERT.assertCounterGt("exceptions.callTimedOut", 0, TEST_UTIL.getHBaseCluster()</span>
-<span class="source-line-no">137</span><span id="line-137"> .getRegionServer(0).getRpcServer().getMetrics().getMetricsSource());</span>
-<span class="source-line-no">138</span><span id="line-138"> }</span>
-<span class="source-line-no">139</span><span id="line-139"> }</span>
-<span class="source-line-no">140</span><span id="line-140"></span>
-<span class="source-line-no">141</span><span id="line-141"> private static class RegionServerWithScanTimeout</span>
-<span class="source-line-no">142</span><span id="line-142"> extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {</span>
-<span class="source-line-no">143</span><span id="line-143"> public RegionServerWithScanTimeout(Configuration conf)</span>
-<span class="source-line-no">144</span><span id="line-144"> throws IOException, InterruptedException {</span>
-<span class="source-line-no">145</span><span id="line-145"> super(conf);</span>
-<span class="source-line-no">146</span><span id="line-146"> }</span>
-<span class="source-line-no">147</span><span id="line-147"></span>
-<span class="source-line-no">148</span><span id="line-148"> @Override</span>
-<span class="source-line-no">149</span><span id="line-149"> protected RSRpcServices createRpcServices() throws IOException {</span>
-<span class="source-line-no">150</span><span id="line-150"> return new RSRpcServicesWithScanTimeout(this);</span>
+<span class="source-line-no">063</span><span id="line-63"> private static final Logger LOG = LoggerFactory.getLogger(TestScannerTimeoutHandling.class);</span>
+<span class="source-line-no">064</span><span id="line-64"> private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">065</span><span id="line-65"> private static final MetricsAssertHelper METRICS_ASSERT =</span>
+<span class="source-line-no">066</span><span id="line-66"> CompatibilityFactory.getInstance(MetricsAssertHelper.class);</span>
+<span class="source-line-no">067</span><span id="line-67"> private static final int TIMEOUT = 3000;</span>
+<span class="source-line-no">068</span><span id="line-68"> private static final TableName TABLE_NAME = TableName.valueOf("foo");</span>
+<span class="source-line-no">069</span><span id="line-69"> private static Connection CONN;</span>
+<span class="source-line-no">070</span><span id="line-70"></span>
+<span class="source-line-no">071</span><span id="line-71"> @BeforeAll</span>
+<span class="source-line-no">072</span><span id="line-72"> public static void setUpBeforeClass() throws Exception {</span>
+<span class="source-line-no">073</span><span id="line-73"> Configuration conf = TEST_UTIL.getConfiguration();</span>
+<span class="source-line-no">074</span><span id="line-74"> // Don't report so often so easier to see other rpcs</span>
+<span class="source-line-no">075</span><span id="line-75"> conf.setInt("hbase.regionserver.msginterval", 3 * 10000);</span>
+<span class="source-line-no">076</span><span id="line-76"> conf.setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, TIMEOUT);</span>
+<span class="source-line-no">077</span><span id="line-77"> // conf.setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, TIMEOUT);</span>
+<span class="source-line-no">078</span><span id="line-78"> conf.setStrings(HConstants.REGION_SERVER_IMPL, RegionServerWithScanTimeout.class.getName());</span>
+<span class="source-line-no">079</span><span id="line-79"> conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 0);</span>
+<span class="source-line-no">080</span><span id="line-80"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">081</span><span id="line-81"> TEST_UTIL.createTable(TABLE_NAME, "0");</span>
+<span class="source-line-no">082</span><span id="line-82"></span>
+<span class="source-line-no">083</span><span id="line-83"> CONN = ConnectionFactory.createConnection(conf);</span>
+<span class="source-line-no">084</span><span id="line-84"> }</span>
+<span class="source-line-no">085</span><span id="line-85"></span>
+<span class="source-line-no">086</span><span id="line-86"> @AfterAll</span>
+<span class="source-line-no">087</span><span id="line-87"> public static void tearDownAfterClass() throws Exception {</span>
+<span class="source-line-no">088</span><span id="line-88"> CONN.close();</span>
+<span class="source-line-no">089</span><span id="line-89"> TEST_UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">090</span><span id="line-90"> }</span>
+<span class="source-line-no">091</span><span id="line-91"></span>
+<span class="source-line-no">092</span><span id="line-92"> /**</span>
+<span class="source-line-no">093</span><span id="line-93"> * If a client's timeout would be exceeded before scan results are ready, there is no point</span>
+<span class="source-line-no">094</span><span id="line-94"> * returning results to the client. Worse, for openScanner calls, the client cannot close the</span>
+<span class="source-line-no">095</span><span id="line-95"> * timed out scanner so this leaks scanners on the server. This test verifies that we properly</span>
+<span class="source-line-no">096</span><span id="line-96"> * track and cleanup scanners when a client timeout is exceeded. This should be more rare when</span>
+<span class="source-line-no">097</span><span id="line-97"> * heartbeats are enabled, since we try to return before timeout there. But it's still possible if</span>
+<span class="source-line-no">098</span><span id="line-98"> * queueing eats up most of the timeout or the inner workings of the scan were slowed down enough</span>
+<span class="source-line-no">099</span><span id="line-99"> * to still exceed the timeout despite the calculated heartbeat deadline.</span>
+<span class="source-line-no">100</span><span id="line-100"> */</span>
+<span class="source-line-no">101</span><span id="line-101"> @Test</span>
+<span class="source-line-no">102</span><span id="line-102"> public void testExceededClientDeadline() throws Exception {</span>
+<span class="source-line-no">103</span><span id="line-103"> Table table = CONN.getTable(TABLE_NAME);</span>
+<span class="source-line-no">104</span><span id="line-104"></span>
+<span class="source-line-no">105</span><span id="line-105"> // put some rows so that our scanner doesn't complete on the first rpc.</span>
+<span class="source-line-no">106</span><span id="line-106"> // this would prematurely close the scanner before the timeout handling has a chance to</span>
+<span class="source-line-no">107</span><span id="line-107"> for (int i = 0; i < 10; i++) {</span>
+<span class="source-line-no">108</span><span id="line-108"> table.put(new Put(Bytes.toBytes(i)).addColumn(new byte[] { '0' }, new byte[] { '0' },</span>
+<span class="source-line-no">109</span><span id="line-109"> new byte[] { '0' }));</span>
+<span class="source-line-no">110</span><span id="line-110"> }</span>
+<span class="source-line-no">111</span><span id="line-111"></span>
+<span class="source-line-no">112</span><span id="line-112"> try {</span>
+<span class="source-line-no">113</span><span id="line-113"> ResultScanner scanner = table.getScanner(new Scan().setCaching(1).setMaxResultSize(1));</span>
+<span class="source-line-no">114</span><span id="line-114"> scanner.next();</span>
+<span class="source-line-no">115</span><span id="line-115"> } catch (RetriesExhaustedException e) {</span>
+<span class="source-line-no">116</span><span id="line-116"> assertTrue(e.getCause() instanceof CallTimeoutException);</span>
+<span class="source-line-no">117</span><span id="line-117"> } finally {</span>
+<span class="source-line-no">118</span><span id="line-118"> // ensure the scan has finished on the server side</span>
+<span class="source-line-no">119</span><span id="line-119"> RSRpcServicesWithScanTimeout.lock.tryLock(60, TimeUnit.SECONDS);</span>
+<span class="source-line-no">120</span><span id="line-120"> // there should be 0 running scanners, meaning the scanner was properly closed on the server</span>
+<span class="source-line-no">121</span><span id="line-121"> assertEquals(0, RSRpcServicesWithScanTimeout.scannerCount);</span>
+<span class="source-line-no">122</span><span id="line-122"> // we should have caught the expected exception</span>
+<span class="source-line-no">123</span><span id="line-123"> assertTrue(RSRpcServicesWithScanTimeout.caughtTimeoutException);</span>
+<span class="source-line-no">124</span><span id="line-124"> // we should have incremented the callTimedOut metric</span>
+<span class="source-line-no">125</span><span id="line-125"> METRICS_ASSERT.assertCounterGt("exceptions.callTimedOut", 0, TEST_UTIL.getHBaseCluster()</span>
+<span class="source-line-no">126</span><span id="line-126"> .getRegionServer(0).getRpcServer().getMetrics().getMetricsSource());</span>
+<span class="source-line-no">127</span><span id="line-127"> }</span>
+<span class="source-line-no">128</span><span id="line-128"> }</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130"> private static class RegionServerWithScanTimeout</span>
+<span class="source-line-no">131</span><span id="line-131"> extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {</span>
+<span class="source-line-no">132</span><span id="line-132"> public RegionServerWithScanTimeout(Configuration conf)</span>
+<span class="source-line-no">133</span><span id="line-133"> throws IOException, InterruptedException {</span>
+<span class="source-line-no">134</span><span id="line-134"> super(conf);</span>
+<span class="source-line-no">135</span><span id="line-135"> }</span>
+<span class="source-line-no">136</span><span id="line-136"></span>
+<span class="source-line-no">137</span><span id="line-137"> @Override</span>
+<span class="source-line-no">138</span><span id="line-138"> protected RSRpcServices createRpcServices() throws IOException {</span>
+<span class="source-line-no">139</span><span id="line-139"> return new RSRpcServicesWithScanTimeout(this);</span>
+<span class="source-line-no">140</span><span id="line-140"> }</span>
+<span class="source-line-no">141</span><span id="line-141"> }</span>
+<span class="source-line-no">142</span><span id="line-142"></span>
+<span class="source-line-no">143</span><span id="line-143"> private static class RSRpcServicesWithScanTimeout extends RSRpcServices {</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145"> private static boolean caughtTimeoutException = false;</span>
+<span class="source-line-no">146</span><span id="line-146"> private static int scannerCount = -1;</span>
+<span class="source-line-no">147</span><span id="line-147"> private static final Lock lock = new ReentrantLock();</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149"> public RSRpcServicesWithScanTimeout(HRegionServer rs) throws IOException {</span>
+<span class="source-line-no">150</span><span id="line-150"> super(rs);</span>
<span class="source-line-no">151</span><span id="line-151"> }</span>
-<span class="source-line-no">152</span><span id="line-152"> }</span>
-<span class="source-line-no">153</span><span id="line-153"></span>
-<span class="source-line-no">154</span><span id="line-154"> private static class RSRpcServicesWithScanTimeout extends RSRpcServices {</span>
-<span class="source-line-no">155</span><span id="line-155"></span>
-<span class="source-line-no">156</span><span id="line-156"> private static boolean caughtTimeoutException = false;</span>
-<span class="source-line-no">157</span><span id="line-157"> private static int scannerCount = -1;</span>
-<span class="source-line-no">158</span><span id="line-158"> private static final Lock lock = new ReentrantLock();</span>
+<span class="source-line-no">152</span><span id="line-152"></span>
+<span class="source-line-no">153</span><span id="line-153"> @Override</span>
+<span class="source-line-no">154</span><span id="line-154"> public ClientProtos.ScanResponse scan(final RpcController controller,</span>
+<span class="source-line-no">155</span><span id="line-155"> final ClientProtos.ScanRequest request) throws ServiceException {</span>
+<span class="source-line-no">156</span><span id="line-156"></span>
+<span class="source-line-no">157</span><span id="line-157"> String regionName = Bytes.toString(request.getRegion().getValue().toByteArray());</span>
+<span class="source-line-no">158</span><span id="line-158"> if (regionName.contains(TABLE_NAME.getNameAsString())) {</span>
<span class="source-line-no">159</span><span id="line-159"></span>
-<span class="source-line-no">160</span><span id="line-160"> public RSRpcServicesWithScanTimeout(HRegionServer rs) throws IOException {</span>
-<span class="source-line-no">161</span><span id="line-161"> super(rs);</span>
-<span class="source-line-no">162</span><span id="line-162"> }</span>
-<span class="source-line-no">163</span><span id="line-163"></span>
-<span class="source-line-no">164</span><span id="line-164"> @Override</span>
-<span class="source-line-no">165</span><span id="line-165"> public ClientProtos.ScanResponse scan(final RpcController controller,</span>
-<span class="source-line-no">166</span><span id="line-166"> final ClientProtos.ScanRequest request) throws ServiceException {</span>
-<span class="source-line-no">167</span><span id="line-167"></span>
-<span class="source-line-no">168</span><span id="line-168"> String regionName = Bytes.toString(request.getRegion().getValue().toByteArray());</span>
-<span class="source-line-no">169</span><span id="line-169"> if (regionName.contains(TABLE_NAME.getNameAsString())) {</span>
+<span class="source-line-no">160</span><span id="line-160"> // if the client's timeout is exceeded, it may either retry or attempt to close</span>
+<span class="source-line-no">161</span><span id="line-161"> // the scanner. we don't want to allow either until we've verified the server handling.</span>
+<span class="source-line-no">162</span><span id="line-162"> // so only allow 1 request at a time to our test table</span>
+<span class="source-line-no">163</span><span id="line-163"> try {</span>
+<span class="source-line-no">164</span><span id="line-164"> if (!lock.tryLock(60, TimeUnit.SECONDS)) {</span>
+<span class="source-line-no">165</span><span id="line-165"> throw new ServiceException("Failed to get lock");</span>
+<span class="source-line-no">166</span><span id="line-166"> }</span>
+<span class="source-line-no">167</span><span id="line-167"> } catch (InterruptedException e) {</span>
+<span class="source-line-no">168</span><span id="line-168"> throw new ServiceException(e);</span>
+<span class="source-line-no">169</span><span id="line-169"> }</span>
<span class="source-line-no">170</span><span id="line-170"></span>
-<span class="source-line-no">171</span><span id="line-171"> // if the client's timeout is exceeded, it may either retry or attempt to close</span>
-<span class="source-line-no">172</span><span id="line-172"> // the scanner. we don't want to allow either until we've verified the server handling.</span>
-<span class="source-line-no">173</span><span id="line-173"> // so only allow 1 request at a time to our test table</span>
-<span class="source-line-no">174</span><span id="line-174"> try {</span>
-<span class="source-line-no">175</span><span id="line-175"> if (!lock.tryLock(60, TimeUnit.SECONDS)) {</span>
-<span class="source-line-no">176</span><span id="line-176"> throw new ServiceException("Failed to get lock");</span>
-<span class="source-line-no">177</span><span id="line-177"> }</span>
-<span class="source-line-no">178</span><span id="line-178"> } catch (InterruptedException e) {</span>
-<span class="source-line-no">179</span><span id="line-179"> throw new ServiceException(e);</span>
-<span class="source-line-no">180</span><span id="line-180"> }</span>
-<span class="source-line-no">181</span><span id="line-181"></span>
-<span class="source-line-no">182</span><span id="line-182"> try {</span>
-<span class="source-line-no">183</span><span id="line-183"> LOG.info("SLEEPING");</span>
-<span class="source-line-no">184</span><span id="line-184"> Thread.sleep(TIMEOUT * 2);</span>
-<span class="source-line-no">185</span><span id="line-185"> } catch (Exception e) {</span>
-<span class="source-line-no">186</span><span id="line-186"> }</span>
-<span class="source-line-no">187</span><span id="line-187"></span>
-<span class="source-line-no">188</span><span id="line-188"> try {</span>
-<span class="source-line-no">189</span><span id="line-189"> return super.scan(controller, request);</span>
-<span class="source-line-no">190</span><span id="line-190"> } catch (ServiceException e) {</span>
-<span class="source-line-no">191</span><span id="line-191"> if (</span>
-<span class="source-line-no">192</span><span id="line-192"> e.getCause() instanceof ScannerResetException</span>
-<span class="source-line-no">193</span><span id="line-193"> && e.getCause().getCause() instanceof TimeoutIOException</span>
-<span class="source-line-no">194</span><span id="line-194"> ) {</span>
-<span class="source-line-no">195</span><span id="line-195"> LOG.info("caught EXPECTED exception in scan after sleep", e);</span>
-<span class="source-line-no">196</span><span id="line-196"> caughtTimeoutException = true;</span>
-<span class="source-line-no">197</span><span id="line-197"> } else {</span>
-<span class="source-line-no">198</span><span id="line-198"> LOG.warn("caught UNEXPECTED exception in scan after sleep", e);</span>
-<span class="source-line-no">199</span><span id="line-199"> }</span>
-<span class="source-line-no">200</span><span id="line-200"> } finally {</span>
-<span class="source-line-no">201</span><span id="line-201"> scannerCount = getScannersCount();</span>
-<span class="source-line-no">202</span><span id="line-202"> lock.unlock();</span>
-<span class="source-line-no">203</span><span id="line-203"> }</span>
-<span class="source-line-no">204</span><span id="line-204"> }</span>
-<span class="source-line-no">205</span><span id="line-205"></span>
-<span class="source-line-no">206</span><span id="line-206"> return super.scan(controller, request);</span>
-<span class="source-line-no">207</span><span id="line-207"></span>
-<span class="source-line-no">208</span><span id="line-208"> }</span>
-<span class="source-line-no">209</span><span id="line-209"> }</span>
-<span class="source-line-no">210</span><span id="line-210">}</span>
+<span class="source-line-no">171</span><span id="line-171"> try {</span>
+<span class="source-line-no">172</span><span id="line-172"> LOG.info("SLEEPING");</span>
+<span class="source-line-no">173</span><span id="line-173"> Thread.sleep(TIMEOUT * 2);</span>
+<span class="source-line-no">174</span><span id="line-174"> } catch (Exception e) {</span>
+<span class="source-line-no">175</span><span id="line-175"> }</span>
+<span class="source-line-no">176</span><span id="line-176"></span>
+<span class="source-line-no">177</span><span id="line-177"> try {</span>
+<span class="source-line-no">178</span><span id="line-178"> return super.scan(controller, request);</span>
+<span class="source-line-no">179</span><span id="line-179"> } catch (ServiceException e) {</span>
+<span class="source-line-no">180</span><span id="line-180"> if (</span>
+<span class="source-line-no">181</span><span id="line-181"> e.getCause() instanceof ScannerResetException</span>
+<span class="source-line-no">182</span><span id="line-182"> && e.getCause().getCause() instanceof TimeoutIOException</span>
+<span class="source-line-no">183</span><span id="line-183"> ) {</span>
+<span class="source-line-no">184</span><span id="line-184"> LOG.info("caught EXPECTED exception in scan after sleep", e);</span>
+<span class="source-line-no">185</span><span id="line-185"> caughtTimeoutException = true;</span>
+<span class="source-line-no">186</span><span id="line-186"> } else {</span>
+<span class="source-line-no">187</span><span id="line-187"> LOG.warn("caught UNEXPECTED exception in scan after sleep", e);</span>
+<span class="source-line-no">188</span><span id="line-188"> }</span>
+<span class="source-line-no">189</span><span id="line-189"> } finally {</span>
+<span class="source-line-no">190</span><span id="line-190"> scannerCount = getScannersCount();</span>
+<span class="source-line-no">191</span><span id="line-191"> lock.unlock();</span>
+<span class="source-line-no">192</span><span id="line-192"> }</span>
+<span class="source-line-no">193</span><span id="line-193"> }</span>
+<span class="source-line-no">194</span><span id="line-194"></span>
+<span class="source-line-no">195</span><span id="line-195"> return super.scan(controller, request);</span>
+<span class="source-line-no">196</span><span id="line-196"></span>
+<span class="source-line-no">197</span><span id="line-197"> }</span>
+<span class="source-line-no">198</span><span id="line-198"> }</span>
+<span class="source-line-no">199</span><span id="line-199">}</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html
index 209e81c2ac4..dfc24a6f745 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.html
@@ -32,58 +32,58 @@
<span class="source-line-no">019</span><span id="line-19"></span>
<span class="source-line-no">020</span><span id="line-20">import static org.apache.hadoop.hbase.regionserver.HStoreFile.BULKLOAD_TIME_KEY;</span>
<span class="source-line-no">021</span><span id="line-21">import static org.apache.hadoop.hbase.regionserver.HStoreFile.MAX_SEQ_ID_KEY;</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
-<span class="source-line-no">024</span><span id="line-24">import java.util.List;</span>
-<span class="source-line-no">025</span><span id="line-25">import java.util.concurrent.CountDownLatch;</span>
-<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.conf.Configuration;</span>
-<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.fs.FileSystem;</span>
-<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.fs.Path;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.Cell;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.KeyValue;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.TableNotFoundException;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.Admin;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.io.hfile.HFile;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.io.hfile.HFileContext;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.tool.BulkLoadHFiles;</span>
-<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
-<span class="source-line-no">052</span><span id="line-52">import org.junit.AfterClass;</span>
-<span class="source-line-no">053</span><span id="line-53">import org.junit.Assert;</span>
-<span class="source-line-no">054</span><span id="line-54">import org.junit.BeforeClass;</span>
-<span class="source-line-no">055</span><span id="line-55">import org.junit.ClassRule;</span>
-<span class="source-line-no">056</span><span id="line-56">import org.junit.Rule;</span>
-<span class="source-line-no">057</span><span id="line-57">import org.junit.Test;</span>
-<span class="source-line-no">058</span><span id="line-58">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">059</span><span id="line-59">import org.junit.rules.TestName;</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61">@Category({ RegionServerTests.class, MediumTests.class })</span>
+<span class="source-line-no">022</span><span id="line-22">import static org.junit.jupiter.api.Assertions.assertEquals;</span>
+<span class="source-line-no">023</span><span id="line-23">import static org.junit.jupiter.api.Assertions.assertNotNull;</span>
+<span class="source-line-no">024</span><span id="line-24"></span>
+<span class="source-line-no">025</span><span id="line-25">import java.io.IOException;</span>
+<span class="source-line-no">026</span><span id="line-26">import java.util.List;</span>
+<span class="source-line-no">027</span><span id="line-27">import java.util.concurrent.CountDownLatch;</span>
+<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.conf.Configuration;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.fs.FileSystem;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.fs.Path;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.Cell;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.KeyValue;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.TableNotFoundException;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.Admin;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.apache.hadoop.hbase.io.hfile.HFile;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.apache.hadoop.hbase.io.hfile.HFileContext;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.apache.hadoop.hbase.testclassification.RegionServerTests;</span>
+<span class="source-line-no">050</span><span id="line-50">import org.apache.hadoop.hbase.tool.BulkLoadHFiles;</span>
+<span class="source-line-no">051</span><span id="line-51">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">052</span><span id="line-52">import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;</span>
+<span class="source-line-no">053</span><span id="line-53">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">054</span><span id="line-54">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">055</span><span id="line-55">import org.junit.jupiter.api.BeforeEach;</span>
+<span class="source-line-no">056</span><span id="line-56">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">057</span><span id="line-57">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">058</span><span id="line-58">import org.junit.jupiter.api.TestInfo;</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">@Tag(RegionServerTests.TAG)</span>
+<span class="source-line-no">061</span><span id="line-61">@Tag(MediumTests.TAG)</span>
<span class="source-line-no">062</span><span id="line-62">public class TestScannerWithBulkload {</span>
<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64"> @ClassRule</span>
-<span class="source-line-no">065</span><span id="line-65"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">066</span><span id="line-66"> HBaseClassTestRule.forClass(TestScannerWithBulkload.class);</span>
+<span class="source-line-no">064</span><span id="line-64"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">065</span><span id="line-65"></span>
+<span class="source-line-no">066</span><span id="line-66"> private String methodName;</span>
<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70"> @Rule</span>
-<span class="source-line-no">071</span><span id="line-71"> public TestName name = new TestName();</span>
+<span class="source-line-no">068</span><span id="line-68"> @BeforeEach</span>
+<span class="source-line-no">069</span><span id="line-69"> public void setTestName(TestInfo testInfo) {</span>
+<span class="source-line-no">070</span><span id="line-70"> this.methodName = testInfo.getTestMethod().get().getName();</span>
+<span class="source-line-no">071</span><span id="line-71"> }</span>
<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73"> @BeforeClass</span>
+<span class="source-line-no">073</span><span id="line-73"> @BeforeAll</span>
<span class="source-line-no">074</span><span id="line-74"> public static void setUpBeforeClass() throws Exception {</span>
<span class="source-line-no">075</span><span id="line-75"> TEST_UTIL.startMiniCluster(1);</span>
<span class="source-line-no">076</span><span id="line-76"> }</span>
@@ -98,7 +98,7 @@
<span class="source-line-no">085</span><span id="line-85"></span>
<span class="source-line-no">086</span><span id="line-86"> @Test</span>
<span class="source-line-no">087</span><span id="line-87"> public void testBulkLoad() throws Exception {</span>
-<span class="source-line-no">088</span><span id="line-88"> final TableName tableName = TableName.valueOf(name.getMethodName());</span>
+<span class="source-line-no">088</span><span id="line-88"> final TableName tableName = TableName.valueOf(methodName);</span>
<span class="source-line-no">089</span><span id="line-89"> long l = EnvironmentEdgeManager.currentTime();</span>
<span class="source-line-no">090</span><span id="line-90"> Admin admin = TEST_UTIL.getAdmin();</span>
<span class="source-line-no">091</span><span id="line-91"> createTable(admin, tableName);</span>
@@ -130,7 +130,7 @@
<span class="source-line-no">117</span><span id="line-117"> _c.getQualifierLength()));</span>
<span class="source-line-no">118</span><span id="line-118"> System.out</span>
<span class="source-line-no">119</span><span id="line-119"> .println(Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
-<span class="source-line-no">120</span><span id="line-120"> Assert.assertEquals("version3",</span>
+<span class="source-line-no">120</span><span id="line-120"> assertEquals("version3",</span>
<span class="source-line-no">121</span><span id="line-121"> Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
<span class="source-line-no">122</span><span id="line-122"> }</span>
<span class="source-line-no">123</span><span id="line-123"> }</span>
@@ -152,7 +152,7 @@
<span class="source-line-no">139</span><span id="line-139"> _c.getQualifierLength()));</span>
<span class="source-line-no">140</span><span id="line-140"> System.out</span>
<span class="source-line-no">141</span><span id="line-141"> .println(Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
-<span class="source-line-no">142</span><span id="line-142"> Assert.assertEquals(expctedVal,</span>
+<span class="source-line-no">142</span><span id="line-142"> assertEquals(expctedVal,</span>
<span class="source-line-no">143</span><span id="line-143"> Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
<span class="source-line-no">144</span><span id="line-144"> }</span>
<span class="source-line-no">145</span><span id="line-145"> }</span>
@@ -170,7 +170,7 @@
<span class="source-line-no">157</span><span id="line-157"> fs.mkdirs(hfilePath);</span>
<span class="source-line-no">158</span><span id="line-158"> Path path = new Path(pathStr);</span>
<span class="source-line-no">159</span><span id="line-159"> HFile.WriterFactory wf = HFile.getWriterFactoryNoCache(TEST_UTIL.getConfiguration());</span>
-<span class="source-line-no">160</span><span id="line-160"> Assert.assertNotNull(wf);</span>
+<span class="source-line-no">160</span><span id="line-160"> assertNotNull(wf);</span>
<span class="source-line-no">161</span><span id="line-161"> HFileContext context = new HFileContextBuilder().build();</span>
<span class="source-line-no">162</span><span id="line-162"> HFile.Writer writer = wf.withPath(fs, path).withFileContext(context).create();</span>
<span class="source-line-no">163</span><span id="line-163"> KeyValue kv = new KeyValue(Bytes.toBytes("row1"), Bytes.toBytes("col"), Bytes.toBytes("q"), l,</span>
@@ -220,9 +220,9 @@
<span class="source-line-no">207</span><span id="line-207"> ResultScanner scanner = table.getScanner(scan);</span>
<span class="source-line-no">208</span><span id="line-208"> Result result = scanner.next();</span>
<span class="source-line-no">209</span><span id="line-209"> List<Cell> cells = result.getColumnCells(Bytes.toBytes("col"), Bytes.toBytes("q"));</span>
-<span class="source-line-no">210</span><span id="line-210"> Assert.assertEquals(1, cells.size());</span>
+<span class="source-line-no">210</span><span id="line-210"> assertEquals(1, cells.size());</span>
<span class="source-line-no">211</span><span id="line-211"> Cell _c = cells.get(0);</span>
-<span class="source-line-no">212</span><span id="line-212"> Assert.assertEquals("version1",</span>
+<span class="source-line-no">212</span><span id="line-212"> assertEquals("version1",</span>
<span class="source-line-no">213</span><span id="line-213"> Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
<span class="source-line-no">214</span><span id="line-214"> scanner.close();</span>
<span class="source-line-no">215</span><span id="line-215"> return table;</span>
@@ -230,7 +230,7 @@
<span class="source-line-no">217</span><span id="line-217"></span>
<span class="source-line-no">218</span><span id="line-218"> @Test</span>
<span class="source-line-no">219</span><span id="line-219"> public void testBulkLoadWithParallelScan() throws Exception {</span>
-<span class="source-line-no">220</span><span id="line-220"> final TableName tableName = TableName.valueOf(name.getMethodName());</span>
+<span class="source-line-no">220</span><span id="line-220"> final TableName tableName = TableName.valueOf(methodName);</span>
<span class="source-line-no">221</span><span id="line-221"> final long l = EnvironmentEdgeManager.currentTime();</span>
<span class="source-line-no">222</span><span id="line-222"> final Admin admin = TEST_UTIL.getAdmin();</span>
<span class="source-line-no">223</span><span id="line-223"> createTable(admin, tableName);</span>
@@ -272,7 +272,7 @@
<span class="source-line-no">259</span><span id="line-259"></span>
<span class="source-line-no">260</span><span id="line-260"> @Test</span>
<span class="source-line-no">261</span><span id="line-261"> public void testBulkLoadNativeHFile() throws Exception {</span>
-<span class="source-line-no">262</span><span id="line-262"> final TableName tableName = TableName.valueOf(name.getMethodName());</span>
+<span class="source-line-no">262</span><span id="line-262"> final TableName tableName = TableName.valueOf(methodName);</span>
<span class="source-line-no">263</span><span id="line-263"> long l = EnvironmentEdgeManager.currentTime();</span>
<span class="source-line-no">264</span><span id="line-264"> Admin admin = TEST_UTIL.getAdmin();</span>
<span class="source-line-no">265</span><span id="line-265"> createTable(admin, tableName);</span>
@@ -306,7 +306,7 @@
<span class="source-line-no">293</span><span id="line-293"> _c.getQualifierLength()));</span>
<span class="source-line-no">294</span><span id="line-294"> System.out</span>
<span class="source-line-no">295</span><span id="line-295"> .println(Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
-<span class="source-line-no">296</span><span id="line-296"> Assert.assertEquals("version3",</span>
+<span class="source-line-no">296</span><span id="line-296"> assertEquals("version3",</span>
<span class="source-line-no">297</span><span id="line-297"> Bytes.toString(_c.getValueArray(), _c.getValueOffset(), _c.getValueLength()));</span>
<span class="source-line-no">298</span><span id="line-298"> }</span>
<span class="source-line-no">299</span><span id="line-299"> }</span>
@@ -322,7 +322,7 @@
<span class="source-line-no">309</span><span id="line-309"> return scan;</span>
<span class="source-line-no">310</span><span id="line-310"> }</span>
<span class="source-line-no">311</span><span id="line-311"></span>
-<span class="source-line-no">312</span><span id="line-312"> @AfterClass</span>
+<span class="source-line-no">312</span><span id="line-312"> @AfterAll</span>
<span class="source-line-no">313</span><span id="line-313"> public static void tearDownAfterClass() throws Exception {</span>
<span class="source-line-no">314</span><span id="line-314"> TEST_UTIL.shutdownMiniCluster();</span>
<span class="source-line-no">315</span><span id="line-315"> }</span>
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.CorruptHFileCoprocessor.html b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.CorruptHFileCoprocessor.html
index 6a0b64dc9af..02fbe061b58 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.CorruptHFileCoprocessor.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestScannerWithCorruptHFile.CorruptHFileCoprocessor.html
@@ -30,112 +30,105 @@
<span class="source-line-no">017</span><span id="line-17"> */</span>
<span class="source-line-no">018</span><span id="line-18">package org.apache.hadoop.hbase.regionserver;</span>
<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">import java.io.IOException;</span>
-<span class="source-line-no">021</span><span id="line-21">import java.util.List;</span>
-<span class="source-line-no">022</span><span id="line-22">import java.util.Optional;</span>
-<span class="source-line-no">023</span><span id="line-23">import org.apache.hadoop.hbase.DoNotRetryIOException;</span>
-<span class="source-line-no">024</span><span id="line-24">import org.apache.hadoop.hbase.HBaseClassTestRule;</span>
-<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
-<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.TableName;</span>
-<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
-<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.client.Durability;</span>
-<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.Put;</span>
-<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.Result;</span>
-<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.ResultScanner;</span>
-<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.Scan;</span>
-<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Table;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.coprocessor.ObserverContext;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.coprocessor.RegionObserver;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.io.hfile.CorruptHFileException;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
-<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.util.Bytes;</span>
-<span class="source-line-no">043</span><span id="line-43">import org.junit.AfterClass;</span>
-<span class="source-line-no">044</span><span id="line-44">import org.junit.BeforeClass;</span>
-<span class="source-line-no">045</span><span id="line-45">import org.junit.ClassRule;</span>
-<span class="source-line-no">046</span><span id="line-46">import org.junit.Rule;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.junit.Test;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.junit.experimental.categories.Category;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.junit.rules.TestName;</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">/**</span>
-<span class="source-line-no">052</span><span id="line-52"> * Tests a scanner on a corrupt hfile.</span>
-<span class="source-line-no">053</span><span id="line-53"> */</span>
-<span class="source-line-no">054</span><span id="line-54">@Category(MediumTests.class)</span>
-<span class="source-line-no">055</span><span id="line-55">public class TestScannerWithCorruptHFile {</span>
-<span class="source-line-no">056</span><span id="line-56"></span>
-<span class="source-line-no">057</span><span id="line-57"> @ClassRule</span>
-<span class="source-line-no">058</span><span id="line-58"> public static final HBaseClassTestRule CLASS_RULE =</span>
-<span class="source-line-no">059</span><span id="line-59"> HBaseClassTestRule.forClass(TestScannerWithCorruptHFile.class);</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61"> @Rule</span>
-<span class="source-line-no">062</span><span id="line-62"> public TestName name = new TestName();</span>
-<span class="source-line-no">063</span><span id="line-63"> private static final byte[] FAMILY_NAME = Bytes.toBytes("f");</span>
-<span class="source-line-no">064</span><span id="line-64"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66"> @BeforeClass</span>
-<span class="source-line-no">067</span><span id="line-67"> public static void setup() throws Exception {</span>
-<span class="source-line-no">068</span><span id="line-68"> TEST_UTIL.startMiniCluster(1);</span>
-<span class="source-line-no">069</span><span id="line-69"> }</span>
-<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71"> @AfterClass</span>
-<span class="source-line-no">072</span><span id="line-72"> public static void tearDown() throws Exception {</span>
-<span class="source-line-no">073</span><span id="line-73"> TEST_UTIL.shutdownMiniCluster();</span>
-<span class="source-line-no">074</span><span id="line-74"> }</span>
-<span class="source-line-no">075</span><span id="line-75"></span>
-<span class="source-line-no">076</span><span id="line-76"> public static class CorruptHFileCoprocessor implements RegionCoprocessor, RegionObserver {</span>
-<span class="source-line-no">077</span><span id="line-77"> @Override</span>
-<span class="source-line-no">078</span><span id="line-78"> public Optional<RegionObserver> getRegionObserver() {</span>
-<span class="source-line-no">079</span><span id="line-79"> return Optional.of(this);</span>
-<span class="source-line-no">080</span><span id="line-80"> }</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.junit.jupiter.api.Assertions.assertThrows;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">import java.io.IOException;</span>
+<span class="source-line-no">023</span><span id="line-23">import java.util.List;</span>
+<span class="source-line-no">024</span><span id="line-24">import java.util.Optional;</span>
+<span class="source-line-no">025</span><span id="line-25">import org.apache.hadoop.hbase.DoNotRetryIOException;</span>
+<span class="source-line-no">026</span><span id="line-26">import org.apache.hadoop.hbase.HBaseTestingUtil;</span>
+<span class="source-line-no">027</span><span id="line-27">import org.apache.hadoop.hbase.TableName;</span>
+<span class="source-line-no">028</span><span id="line-28">import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;</span>
+<span class="source-line-no">029</span><span id="line-29">import org.apache.hadoop.hbase.client.Durability;</span>
+<span class="source-line-no">030</span><span id="line-30">import org.apache.hadoop.hbase.client.Put;</span>
+<span class="source-line-no">031</span><span id="line-31">import org.apache.hadoop.hbase.client.Result;</span>
+<span class="source-line-no">032</span><span id="line-32">import org.apache.hadoop.hbase.client.ResultScanner;</span>
+<span class="source-line-no">033</span><span id="line-33">import org.apache.hadoop.hbase.client.Scan;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.apache.hadoop.hbase.client.Table;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.apache.hadoop.hbase.client.TableDescriptor;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.apache.hadoop.hbase.client.TableDescriptorBuilder;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.apache.hadoop.hbase.coprocessor.ObserverContext;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.apache.hadoop.hbase.coprocessor.RegionObserver;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.apache.hadoop.hbase.io.hfile.CorruptHFileException;</span>
+<span class="source-line-no">042</span><span id="line-42">import org.apache.hadoop.hbase.testclassification.MediumTests;</span>
+<span class="source-line-no">043</span><span id="line-43">import org.apache.hadoop.hbase.util.Bytes;</span>
+<span class="source-line-no">044</span><span id="line-44">import org.junit.jupiter.api.AfterAll;</span>
+<span class="source-line-no">045</span><span id="line-45">import org.junit.jupiter.api.BeforeAll;</span>
+<span class="source-line-no">046</span><span id="line-46">import org.junit.jupiter.api.Tag;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.junit.jupiter.api.Test;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.junit.jupiter.api.TestInfo;</span>
+<span class="source-line-no">049</span><span id="line-49"></span>
+<span class="source-line-no">050</span><span id="line-50">/**</span>
+<span class="source-line-no">051</span><span id="line-51"> * Tests a scanner on a corrupt hfile.</span>
+<span class="source-line-no">052</span><span id="line-52"> */</span>
+<span class="source-line-no">053</span><span id="line-53">@Tag(MediumTests.TAG)</span>
+<span class="source-line-no">054</span><span id="line-54">public class TestScannerWithCorruptHFile {</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56"> private static final byte[] FAMILY_NAME = Bytes.toBytes("f");</span>
+<span class="source-line-no">057</span><span id="line-57"> private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59"> @BeforeAll</span>
+<span class="source-line-no">060</span><span id="line-60"> public static void setup() throws Exception {</span>
+<span class="source-line-no">061</span><span id="line-61"> TEST_UTIL.startMiniCluster(1);</span>
+<span class="source-line-no">062</span><span id="line-62"> }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64"> @AfterAll</span>
+<span class="source-line-no">065</span><span id="line-65"> public static void tearDown() throws Exception {</span>
+<span class="source-line-no">066</span><span id="line-66"> TEST_UTIL.shutdownMiniCluster();</span>
+<span class="source-line-no">067</span><span id="line-67"> }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69"> public static class CorruptHFileCoprocessor implements RegionCoprocessor, RegionObserver {</span>
+<span class="source-line-no">070</span><span id="line-70"> @Override</span>
+<span class="source-line-no">071</span><span id="line-71"> public Optional<RegionObserver> getRegionObserver() {</span>
+<span class="source-line-no">072</span><span id="line-72"> return Optional.of(this);</span>
+<span class="source-line-no">073</span><span id="line-73"> }</span>
+<span class="source-line-no">074</span><span id="line-74"></span>
+<span class="source-line-no">075</span><span id="line-75"> @Override</span>
+<span class="source-line-no">076</span><span id="line-76"> public boolean preScannerNext(ObserverContext<? extends RegionCoprocessorEnvironment> e,</span>
+<span class="source-line-no">077</span><span id="line-77"> InternalScanner s, List<Result> results, int limit, boolean hasMore) throws IOException {</span>
+<span class="source-line-no">078</span><span id="line-78"> throw new CorruptHFileException("For test");</span>
+<span class="source-line-no">079</span><span id="line-79"> }</span>
+<span class="source-line-no">080</span><span id="line-80"> }</span>
<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82"> @Override</span>
-<span class="source-line-no">083</span><span id="line-83"> public boolean preScannerNext(ObserverContext<? extends RegionCoprocessorEnvironment> e,</span>
-<span class="source-line-no">084</span><span id="line-84"> InternalScanner s, List<Result> results, int limit, boolean hasMore) throws IOException {</span>
-<span class="source-line-no">085</span><span id="line-85"> throw new CorruptHFileException("For test");</span>
-<span class="source-line-no">086</span><span id="line-86"> }</span>
-<span class="source-line-no">087</span><span id="line-87"> }</span>
-<span class="source-line-no">088</span><span id="line-88"></span>
-<span class="source-line-no">089</span><span id="line-89"> @Test(expected = DoNotRetryIOException.class)</span>
-<span class="source-line-no">090</span><span id="line-90"> public void testScanOnCorruptHFile() throws IOException {</span>
-<span class="source-line-no">091</span><span id="line-91"> TableName tableName = TableName.valueOf(name.getMethodName());</span>
-<span class="source-line-no">092</span><span id="line-92"> TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName)</span>
-<span class="source-line-no">093</span><span id="line-93"> .setCoprocessor(CorruptHFileCoprocessor.class.getName())</span>
-<span class="source-line-no">094</span><span id="line-94"> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_NAME)).build();</span>
-<span class="source-line-no">095</span><span id="line-95"> Table table = TEST_UTIL.createTable(tableDescriptor, null);</span>
-<span class="source-line-no">096</span><span id="line-96"> try {</span>
-<span class="source-line-no">097</span><span id="line-97"> loadTable(table, 1);</span>
-<span class="source-line-no">098</span><span id="line-98"> scan(table);</span>
-<span class="source-line-no">099</span><span id="line-99"> } finally {</span>
-<span class="source-line-no">100</span><span id="line-100"> table.close();</span>
-<span class="source-line-no">101</span><span id="line-101"> }</span>
-<span class="source-line-no">102</span><span id="line-102"> }</span>
-<span class="source-line-no">103</span><span id="line-103"></span>
-<span class="source-line-no">104</span><span id="line-104"> private void loadTable(Table table, int numRows) throws IOException {</span>
-<span class="source-line-no">105</span><span id="line-105"> for (int i = 0; i < numRows; ++i) {</span>
-<span class="source-line-no">106</span><span id="line-106"> byte[] row = Bytes.toBytes(i);</span>
-<span class="source-line-no">107</span><span id="line-107"> Put put = new Put(row);</span>
-<span class="source-line-no">108</span><span id="line-108"> put.setDurability(Durability.SKIP_WAL);</span>
-<span class="source-line-no">109</span><span id="line-109"> put.addColumn(FAMILY_NAME, null, row);</span>
-<span class="source-line-no">110</span><span id="line-110"> table.put(put);</span>
-<span class="source-line-no">111</span><span id="line-111"> }</span>
-<span class="source-line-no">112</span><span id="line-112"> }</span>
-<span class="source-line-no">113</span><span id="line-113"></span>
-<span class="source-line-no">114</span><span id="line-114"> private void scan(Table table) throws IOException {</span>
-<span class="source-line-no">115</span><span id="line-115"> Scan scan = new Scan();</span>
-<span class="source-line-no">116</span><span id="line-116"> scan.setCaching(1);</span>
-<span class="source-line-no">117</span><span id="line-117"> scan.setCacheBlocks(false);</span>
-<span class="source-line-no">118</span><span id="line-118"> ResultScanner scanner = table.getScanner(scan);</span>
-<span class="source-line-no">119</span><span id="line-119"> try {</span>
-<span class="source-line-no">120</span><span id="line-120"> scanner.next();</span>
-<span class="source-line-no">121</span><span id="line-121"> } finally {</span>
-<span class="source-line-no">122</span><span id="line-122"> scanner.close();</span>
-<span class="source-line-no">123</span><span id="line-123"> }</span>
-<span class="source-line-no">124</span><span id="line-124"> }</span>
-<span class="source-line-no">125</span><span id="line-125">}</span>
+<span class="source-line-no">082</span><span id="line-82"> @Test</span>
+<span class="source-line-no">083</span><span id="line-83"> public void testScanOnCorruptHFile(TestInfo testInfo) throws IOException {</span>
+<span class="source-line-no">084</span><span id="line-84"> TableName tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());</span>
+<span class="source-line-no">085</span><span id="line-85"> TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName)</span>
+<span class="source-line-no">086</span><span id="line-86"> .setCoprocessor(CorruptHFileCoprocessor.class.getName())</span>
+<span class="source-line-no">087</span><span id="line-87"> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY_NAME)).build();</span>
+<span class="source-line-no">088</span><span id="line-88"> Table table = TEST_UTIL.createTable(tableDescriptor, null);</span>
+<span class="source-line-no">089</span><span id="line-89"> try {</span>
+<span class="source-line-no">090</span><span id="line-90"> loadTable(table, 1);</span>
+<span class="source-line-no">091</span><span id="line-91"> assertThrows(DoNotRetryIOException.class, () -> scan(table));</span>
+<span class="source-line-no">092</span><span id="line-92"> } finally {</span>
+<span class="source-line-no">093</span><span id="line-93"> table.close();</span>
+<span class="source-line-no">094</span><span id="line-94"> }</span>
+<span class="source-line-no">095</span><span id="line-95"> }</span>
+<span class="source-line-no">096</span><span id="line-96"></span>
+<span class="source-line-no">097</span><span id="line-97"> private void loadTable(Table table, int numRows) throws IOException {</span>
+<span class="source-line-no">098</span><span id="line-98"> for (int i = 0; i < numRows; ++i) {</span>
+<span class="source-line-no">099</span><span id="line-99"> byte[] row = Bytes.toBytes(i);</span>
+<span class="source-line-no">100</span><span id="line-100"> Put put = new Put(row);</span>
+<span class="source-line-no">101</span><span id="line-101"> put.setDurability(Durability.SKIP_WAL);</span>
+<span class="source-line-no">102</span><span id="line-102"> put.addColumn(FAMILY_NAME, null, row);</span>
+<span class="source-line-no">103</span><span id="line-103"> table.put(put);</span>
+<span class="source-line-no">104</span><span id="line-104"> }</span>
+<span class="source-line-no">105</span><span id="line-105"> }</span>
+<span class="source-line-no">106</span><span id="line-106"></span>
+<span class="source-line-no">107</span><span id="line-107"> private void scan(Table table) throws IOException {</span>
+<span class="source-line-no">108</span><span id="line-108"> Scan scan = new Scan();</span>
+<span class="source-line-no">109</span><span id="line-109"> scan.setCaching(1);</span>
+<span class="source-line-no">110</span><span id="line-110"> scan.setCacheBlocks(false);</span>
+<span class="source-line-no">111</span><span id="line-111"> ResultScanner scanner = table.getScanner(scan);</span>
+<span class="source-line-no">112</span><span id="line-112"> try {</span>
... 93299 lines suppressed ...