hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [3/3] hbase git commit: HBASE-20280 Fix possibility of deadlocking in refreshFileConnections
Date Tue, 27 Mar 2018 23:53:06 GMT
HBASE-20280 Fix possibility of deadlocking in refreshFileConnections

When prefetch on open is specified, there is a deadlocking case
where if the prefetch is cancelled, the PrefetchExecutor interrupts
the threads if necessary, when that happens in FileIOEngine, it
causes an ClosedByInterruptException which is a subclass of
ClosedChannelException. If we retry all ClosedChannelExceptions,
this will lock as this access is expected to be interrupted.
This change removes calling refreshFileConnections for
ClosedByInterruptExceptions.

Signed-off-by: Andrew Purtell <apurtell@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/09ed7c7a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/09ed7c7a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/09ed7c7a

Branch: refs/heads/master
Commit: 09ed7c7a1004df9fb98e58dd17eb07a479e427f9
Parents: eb424ac
Author: Zach York <zyork@amazon.com>
Authored: Thu Mar 15 16:46:40 2018 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Tue Mar 27 16:53:01 2018 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/09ed7c7a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.java
index 648d4bc..29b810f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
+import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.FileChannel;
 import java.util.Arrays;
@@ -229,6 +230,8 @@ public class FileIOEngine implements IOEngine {
       }
       try {
         accessLen = accessor.access(fileChannel, buffer, accessOffset);
+      } catch (ClosedByInterruptException e) {
+        throw e;
       } catch (ClosedChannelException e) {
         LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file. ",
e);
         refreshFileConnection(accessFileNum);


Mime
View raw message