Repository: hbase Updated Branches: refs/heads/master 40f8d20cf -> 9497eac4e
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/9497eac4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9497eac4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9497eac4 Branch: refs/heads/master Commit: 9497eac4e01a12acfa6660b5b16e73a45bcf5707 Parents: 40f8d20 Author: Umesh Agashe <uaga...@cloudera.com> Authored: Mon Feb 12 17:49:47 2018 -0800 Committer: Michael Stack <st...@apache.org> Committed: Fri Feb 16 07:01:56 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/9497eac4/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);