You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2013/07/18 05:13:22 UTC
svn commit: r1504351 - in
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase:
procedure/ZKProcedureMemberRpcs.java regionserver/HRegionServer.java
Author: larsh
Date: Thu Jul 18 03:13:21 2013
New Revision: 1504351
URL: http://svn.apache.org/r1504351
Log:
HBASE-8967 Duplicate call to snapshotManager.stop() in HRegionServer (Jerry He)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java?rev=1504351&r1=1504350&r2=1504351&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java Thu Jul 18 03:13:21 2013
@@ -334,7 +334,7 @@ public class ZKProcedureMemberRpcs imple
}
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();
@@ -346,4 +346,4 @@ public class ZKProcedureMemberRpcs imple
zkController.close();
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1504351&r1=1504350&r2=1504351&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Jul 18 03:13:21 2013
@@ -835,8 +835,9 @@ public class HRegionServer implements HR
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);
}
@@ -857,13 +858,6 @@ public class HRegionServer implements HR
// handlers are stuck waiting on meta or root.
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) {