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

HBASE-8871 The region server can crash at startup 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1499921 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2013-07-05 07:28:39 +00:00
parent 6ba235d1cd
commit b12a1c3e1b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
View File

@ -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);

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

@ -794,8 +794,10 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
}
}
// 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;