You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/02/16 15:01:37 UTC
hbase git commit: HBASE-19988 Fixed chatty log from
HRegion#lockRowsAndBuildMiniBatch() when interrupted while waiting on a row
lock
Repository: hbase
Updated Branches:
refs/heads/branch-2 9f27fdaff -> 70d3413ee
HBASE-19988 Fixed chatty log from HRegion#lockRowsAndBuildMiniBatch() when interrupted while waiting on a row lock
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/70d3413e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/70d3413e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/70d3413e
Branch: refs/heads/branch-2
Commit: 70d3413ee23198baeddbe4b1e40f961bdbcf56fc
Parents: 9f27fda
Author: Umesh Agashe <ua...@cloudera.com>
Authored: Mon Feb 12 17:49:47 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Feb 16 07:01:23 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/70d3413e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 0fffe88..6170888 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -3166,8 +3166,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
try {
// if atomic then get exclusive lock, else shared lock
rowLock = region.getRowLockInternal(mutation.getRow(), !isAtomic(), prevRowLock);
- } catch (TimeoutIOException e) {
- // We will retry when other exceptions, but we should stop if we timeout .
+ } catch (TimeoutIOException|InterruptedIOException e) {
+ // NOTE: We will retry when other exceptions, but we should stop if we receive
+ // TimeoutIOException or InterruptedIOException as operation has timed out or
+ // interrupted respectively.
throw e;
} catch (IOException ioe) {
LOG.warn("Failed getting lock, row=" + Bytes.toStringBinary(mutation.getRow()), ioe);