Repository: hbase Updated Branches: refs/heads/branch-1.3 6bb7b4cde -> f5495b7c8
HBASE-21357 RS should abort if OOM in Reader thread Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f5495b7c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f5495b7c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f5495b7c Branch: refs/heads/branch-1.3 Commit: f5495b7c84c4af21b4955fc9ec4eb3dd5c9d5f26 Parents: 6bb7b4c Author: Allan Yang <allan...@apache.org> Authored: Wed Oct 24 11:10:20 2018 +0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Thu Nov 8 10:48:19 2018 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f5495b7c/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index 8f8c22f..152a71c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -734,6 +734,17 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver { return; } catch (IOException ex) { LOG.info(getName() + ": IOException in Reader", ex); + } catch (OutOfMemoryError e) { + if (getErrorHandler() != null) { + if (getErrorHandler().checkOOME(e)) { + RpcServer.LOG.info(Thread.currentThread().getName() + + ": exiting on OutOfMemoryError"); + return; + } + } else { + // rethrow if no handler + throw e; + } } } }
