You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2013/07/05 09:30:26 UTC
svn commit: r1499922 - in /hbase/branches/0.95:
hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: nkeywal
Date: Fri Jul 5 07:30:25 2013
New Revision: 1499922
URL: http://svn.apache.org/r1499922
Log:
HBASE-8871 The region server can crash at startup
Modified:
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java?rev=1499922&r1=1499921&r2=1499922&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java (original)
+++ hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java Fri Jul 5 07:30:25 2013
@@ -89,7 +89,7 @@ public class ZKConfig {
Properties zkProperties = new Properties();
// Directly map all of the hbase.zookeeper.property.KEY properties.
- for (Entry<String, String> entry : conf) {
+ for (Entry<String, String> entry : new Configuration(conf)) { // copy for mt safety
String key = entry.getKey();
if (key.startsWith(HConstants.ZK_CFG_PROPERTY_PREFIX)) {
String zkKey = key.substring(HConstants.ZK_CFG_PROPERTY_PREFIX_LEN);
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=1499922&r1=1499921&r2=1499922&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 Fri Jul 5 07:30:25 2013
@@ -794,8 +794,10 @@ public class HRegionServer implements Cl
}
}
- // start the snapshot handler, since the server is ready to run
- this.snapshotManager.start();
+ if (!this.stopped && isHealthy()){
+ // start the snapshot handler, since the server is ready to run
+ this.snapshotManager.start();
+ }
// We registered with the Master. Go into run mode.
long lastMsg = 0;