diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java index 3173a52..04bce5b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java @@ -336,7 +336,7 @@ public class ZKProcedureMemberRpcs implements ProcedureMemberRpcs { } public void start(final String memberName, final ProcedureMember listener) { - LOG.debug("Starting procedure member '" + this.memberName + "'"); + LOG.debug("Starting procedure member '" + memberName + "'"); this.member = listener; this.memberName = memberName; watchForAbortedProcedures(); @@ -348,4 +348,4 @@ public class ZKProcedureMemberRpcs implements ProcedureMemberRpcs { zkController.close(); } -} \ No newline at end of file +} 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 e6c991e..9c07a7b 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 @@ -886,8 +886,9 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa this.healthCheckChore.interrupt(); } + // Stop the snapshot handler, forcefully killing all running tasks try { - if (snapshotManager != null) snapshotManager.stop(this.abortRequested); + if (snapshotManager != null) snapshotManager.stop(this.abortRequested || this.killed); } catch (IOException e) { LOG.warn("Failed to close snapshot handler cleanly", e); } @@ -908,13 +909,6 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa // handlers are stuck waiting on meta. if (this.catalogTracker != null) this.catalogTracker.stop(); - // stop the snapshot handler, forcefully killing all running tasks - try { - if (snapshotManager != null) snapshotManager.stop(this.abortRequested || this.killed); - } catch (IOException e) { - LOG.warn("Failed to close snapshot handler cleanly", e); - } - // Closing the compactSplit thread before closing meta regions if (!this.killed && containsMetaTableRegions()) { if (!abortRequested || this.fsOk) {