Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22928 ScanMetrics counter update may not happen in case of exception in TableRecordReaderImpl 

Signed-off-by: Reid Chan <reidchan@apache.org>
This commit is contained in:
Pankaj 2019-09-02 08:17:44 +05:30 committed by Reid Chan
parent 212fa2e6d5
commit 0e87e86a29
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
View File

@ -77,6 +77,10 @@ public class TableRecordReaderImpl {
* @throws IOException When restarting fails. * @throws IOException When restarting fails.
*/ */
public void restart(byte[] firstRow) throws IOException { public void restart(byte[] firstRow) throws IOException {
// Update counter metrics based on current scan before reinitializing it
if (currentScan != null) {
updateCounters();
}
currentScan = new Scan(scan); currentScan = new Scan(scan);
currentScan.withStartRow(firstRow); currentScan.withStartRow(firstRow);
currentScan.setScanMetricsEnabled(true); currentScan.setScanMetricsEnabled(true);
@ -219,6 +223,7 @@ public class TableRecordReaderImpl {
} catch (IOException e) { } catch (IOException e) {
// do not retry if the exception tells us not to do so // do not retry if the exception tells us not to do so
if (e instanceof DoNotRetryIOException) { if (e instanceof DoNotRetryIOException) {
updateCounters();
throw e; throw e;
} }
// try to handle all other IOExceptions by restarting // try to handle all other IOExceptions by restarting
@ -257,6 +262,7 @@ public class TableRecordReaderImpl {
updateCounters(); updateCounters();
return false; return false;
} catch (IOException ioe) { } catch (IOException ioe) {
updateCounters();
if (logScannerActivity) { if (logScannerActivity) {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
LOG.info("Mapper took " + (now-timestamp) LOG.info("Mapper took " + (now-timestamp)