Repository: hbase Updated Branches: refs/heads/branch-1.2 d5fb0a585 -> b8a7edab8
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/b8a7edab Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b8a7edab Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b8a7edab Branch: refs/heads/branch-1.2 Commit: b8a7edab8be70ee860cd4242b397980d066c1ae7 Parents: d5fb0a5 Author: Allan Yang <allan...@apache.org> Authored: Wed Oct 24 11:10:20 2018 +0800 Committer: Sean Busbey <bus...@apache.org> Committed: Fri Nov 16 23:23:00 2018 -0600 ---------------------------------------------------------------------- .../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/b8a7edab/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 4f8101b..9708b12 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 @@ -652,6 +652,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; + } } } }
