From a331cc55cec048047edb23ca2e22d4b238f51fef Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 2 Jul 2015 15:06:12 +0530 Subject: [PATCH] HBASE-13986:HMaster instance never sets abortRequested flag but uses it[isAborted()] in many places. --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 1 + .../main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index ff5cb64..a373f9e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -2014,6 +2014,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server { getLoadedCoprocessors()); } if (t != null) LOG.fatal(msg, t); + this.abortRequested = true; stop(msg); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 43c2836..f5930cc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -295,7 +295,7 @@ public class HRegionServer extends HasThread implements // Go down hard. Used if file system becomes unavailable and also in // debugging and unit tests. - private volatile boolean abortRequested; + protected volatile boolean abortRequested; ConcurrentMap rowlocks = new ConcurrentHashMap(); -- 1.8.4.msysgit.0