From 5ca61a4298995f9f52887a954e6560553cd49a36 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Mon, 12 Feb 2018 17:49:47 -0800 Subject: [PATCH] HBASE-19988 Fixed chatty log from HRegion#lockRowsAndBuildMiniBatch() when interrupted while waiting on a row lock --- .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 0fffe88e820cbc96b001beac71638d28b5ad0dfd..61708883f6a59ca49b3f7eaa4b72d8c731a6b61a 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); -- 2.14.3 (Apple Git-98)