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

HBASE-2781 ZKW.createUnassignedRegion doesn't make sure existing znode is 

in the right state (Karthik Ranganathan via JD)


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@963910 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2010-07-14 00:07:03 +00:00
parent d89cb8d0c5
commit 643ae0c985
3 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -432,6 +432,8 @@ Release 0.21.0 - Unreleased
HBASE-2797 Another NPE in ReadWriteConsistencyControl
HBASE-2831 Fix '$bin' path duplication in setup scripts
(Nicolas Spiegelberg via Stack)
HBASE-2781 ZKW.createUnassignedRegion doesn't make sure existing znode is
in the right state (Karthik Ranganathan via JD)
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable

5
src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
View File

@ -993,8 +993,9 @@ public class RegionManager {
// should never happen
LOG.error("Error creating event data for " + HBaseEventType.M2ZK_REGION_OFFLINE, e);
}
zkWrapper.createUnassignedRegion(info.getEncodedName(), data);
LOG.debug("Created UNASSIGNED zNode " + info.getRegionNameAsString() + " in state " + HBaseEventType.M2ZK_REGION_OFFLINE);
zkWrapper.createOrUpdateUnassignedRegion(info.getEncodedName(), data);
LOG.debug("Created/updated UNASSIGNED zNode " + info.getRegionNameAsString() +
" in state " + HBaseEventType.M2ZK_REGION_OFFLINE);
s = new RegionState(info, RegionState.State.UNASSIGNED);
regionsInTransition.put(info.getRegionNameAsString(), s);
}

68
src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
View File

@ -1073,6 +1073,14 @@ public class ZooKeeperWrapper implements Watcher {
}
}
/**
* Given a region name and some data, this method creates a new the region
* znode data under the UNASSGINED znode with the data passed in. This method
* will not update data for existing znodes.
*
* @param regionName - encoded name of the region
* @param data - new serialized data to update the region znode
*/
public void createUnassignedRegion(String regionName, byte[] data) {
String znode = getZNode(getRegionInTransitionZNode(), regionName);
if(LOG.isDebugEnabled()) {
@ -1109,6 +1117,66 @@ public class ZooKeeperWrapper implements Watcher {
}
}
/**
* Given a region name and some data, this method updates the region znode
* data under the UNASSGINED znode with the latest data. This method will
* update the znode data only if it already exists.
*
* @param regionName - encoded name of the region
* @param data - new serialized data to update the region znode
*/
public void updateUnassignedRegion(String regionName, byte[] data) {
String znode = getZNode(getRegionInTransitionZNode(), regionName);
// this is an update - make sure the node already exists
if(!exists(znode, true)) {
LOG.error("Cannot update " + znode + " - node does not exist" );
return;
}
if(LOG.isDebugEnabled()) {
// Check existing state for logging purposes.
Stat stat = new Stat();
byte[] oldData = null;
try {
oldData = readZNode(znode, stat);
} catch (IOException e) {
LOG.error("Error reading data for " + znode);
}
if(oldData == null) {
LOG.debug("While updating UNASSIGNED region " + regionName + " - node exists with no data" );
}
else {
LOG.debug("While updating UNASSIGNED region " + regionName + " exists, state = " + (HBaseEventType.fromByte(oldData[0])));
}
}
synchronized(unassignedZNodesWatched) {
unassignedZNodesWatched.add(znode);
try {
writeZNode(znode, data, -1, true);
} catch (IOException e) {
LOG.error("Error writing data for " + znode + ", could not update state to " + (HBaseEventType.fromByte(data[0])));
}
}
}
/**
* This method will create a new region in transition entry in ZK with the
* speficied data if none exists. If one already exists, it will update the
* data with whatever is passed in.
*
* @param regionName - encoded name of the region
* @param data - serialized data for the region znode
*/
public void createOrUpdateUnassignedRegion(String regionName, byte[] data) {
String znode = getZNode(getRegionInTransitionZNode(), regionName);
if(exists(znode, true)) {
updateUnassignedRegion(regionName, data);
}
else {
createUnassignedRegion(regionName, data);
}
}
public void deleteUnassignedRegion(String regionName) {
String znode = getZNode(getRegionInTransitionZNode(), regionName);
try {