You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/07/17 22:50:02 UTC
svn commit: r1504275 - in
/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase:
procedure/ZKProcedureMemberRpcs.java regionserver/HRegionServer.java
Author: tedyu
Date: Wed Jul 17 20:50:02 2013
New Revision: 1504275
URL: http://svn.apache.org/r1504275
Log:
HBASE-8967 Duplicate call to snapshotManager.stop() in HRegionServer (Jerry He)
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java?rev=1504275&r1=1504274&r2=1504275&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ZKProcedureMemberRpcs.java Wed Jul 17 20:50:02 2013
@@ -336,7 +336,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();
@@ -348,4 +348,4 @@ public class ZKProcedureMemberRpcs imple
zkController.close();
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1504275&r1=1504274&r2=1504275&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jul 17 20:50:02 2013
@@ -890,8 +890,9 @@ public class HRegionServer implements Cl
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);
}
@@ -912,13 +913,6 @@ public class HRegionServer implements Cl
// 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) {