HBASE-8142 Sporadic TestZKProcedureControllers failures on trunk

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1458102 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-03-19 03:10:54 +00:00
parent 15c0385d4f
commit 955e0232ba
1 changed files with 3 additions and 5 deletions

View File

@ -883,9 +883,6 @@ public class ZKUtil {
* Set data into node creating node if it doesn't yet exist. * Set data into node creating node if it doesn't yet exist.
* Does not set watch. * Does not set watch.
* *
* WARNING: this is not atomic -- it is possible to get a 0-byte data value in the znode before
* data is written
*
* @param zkw zk reference * @param zkw zk reference
* @param znode path of node * @param znode path of node
* @param data data to set for node * @param data data to set for node
@ -895,10 +892,11 @@ public class ZKUtil {
final byte [] data) final byte [] data)
throws KeeperException { throws KeeperException {
if (checkExists(zkw, znode) == -1) { if (checkExists(zkw, znode) == -1) {
ZKUtil.createWithParents(zkw, znode); ZKUtil.createWithParents(zkw, znode, data);
} } else {
ZKUtil.setData(zkw, znode, data); ZKUtil.setData(zkw, znode, data);
} }
}
/** /**
* Sets the data of the existing znode to be the specified data. The node * Sets the data of the existing znode to be the specified data. The node