Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8967 Duplicate call to snapshotManager.stop() in HRegionServer (Jerry He) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1504274 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2013-07-17 20:49:30 +00:00
parent 7cda30d74c
commit 126526ee30
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
View File

@ -336,7 +336,7 @@ public class ZKProcedureMemberRpcs implements ProcedureMemberRpcs {
} }
public void start(final String memberName, final ProcedureMember listener) { 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.member = listener;
this.memberName = memberName; this.memberName = memberName;
watchForAbortedProcedures(); watchForAbortedProcedures();
@ -348,4 +348,4 @@ public class ZKProcedureMemberRpcs implements ProcedureMemberRpcs {
zkController.close(); zkController.close();
} }
} }

10
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -890,8 +890,9 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
this.healthCheckChore.interrupt(); this.healthCheckChore.interrupt();
} }
// Stop the snapshot handler, forcefully killing all running tasks
try { try {
if (snapshotManager != null) snapshotManager.stop(this.abortRequested); if (snapshotManager != null) snapshotManager.stop(this.abortRequested || this.killed);
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Failed to close snapshot handler cleanly", e); LOG.warn("Failed to close snapshot handler cleanly", e);
} }
@ -912,13 +913,6 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
// handlers are stuck waiting on meta. // handlers are stuck waiting on meta.
if (this.catalogTracker != null) this.catalogTracker.stop(); 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 // Closing the compactSplit thread before closing meta regions
if (!this.killed && containsMetaTableRegions()) { if (!this.killed && containsMetaTableRegions()) {
if (!abortRequested || this.fsOk) { if (!abortRequested || this.fsOk) {