You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gc...@apache.org on 2012/09/15 00:36:04 UTC
svn commit: r1384954 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.java
Author: gchanan
Date: Fri Sep 14 22:36:03 2012
New Revision: 1384954
URL: http://svn.apache.org/viewvc?rev=1384954&view=rev
Log:
HBASE-6260 ADDENDUM (fix test failure plus comment fixups)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.java?rev=1384954&r1=1384953&r2=1384954&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/LoadBalancerTracker.java Fri Sep 14 22:36:03 2012
@@ -30,7 +30,7 @@ import org.apache.zookeeper.KeeperExcept
import com.google.protobuf.InvalidProtocolBufferException;
/**
- * Tracks the load balancer switch up in ZK
+ * Tracks the load balancer state up in ZK
*/
@InterfaceAudience.Private
public class LoadBalancerTracker extends ZooKeeperNodeTracker {
@@ -47,7 +47,7 @@ public class LoadBalancerTracker extends
public boolean isBalancerOn() {
byte [] upData = super.getData(false);
try {
- // is data in ZK is null, use default of on.
+ // if data in ZK is null, use default of on.
return upData == null || parseFrom(upData).getBalancerOn();
} catch (DeserializationException dex) {
LOG.error("ZK state for LoadBalancer could not be parsed " + Bytes.toStringBinary(upData));
@@ -68,6 +68,7 @@ public class LoadBalancerTracker extends
} catch(KeeperException.NodeExistsException nee) {
ZKUtil.setData(watcher, watcher.balancerZNode, upData);
}
+ super.nodeDataChanged(watcher.balancerZNode);
}
private byte [] toByteArray(boolean isBalancerOn) {