Repository: hbase Updated Branches: refs/heads/0.94 02bc51414 -> fbf7b6530
HBASE-12146 RegionServerTracker should escape data in log messages Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fbf7b653 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fbf7b653 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fbf7b653 Branch: refs/heads/0.94 Commit: fbf7b65303cceb672ab74ee66be268d4e2c19c65 Parents: 02bc514 Author: stack <[email protected]> Authored: Sat Oct 4 15:35:57 2014 -0700 Committer: stack <[email protected]> Committed: Sat Oct 4 15:35:57 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/fbf7b653/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java index b89306c..d8f0491 100644 --- a/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java +++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java @@ -47,7 +47,7 @@ import org.apache.zookeeper.KeeperException; */ public class RegionServerTracker extends ZooKeeperListener { private static final Log LOG = LogFactory.getLog(RegionServerTracker.class); - private NavigableMap<ServerName, RegionServerInfo> regionServers = + private NavigableMap<ServerName, RegionServerInfo> regionServers = new TreeMap<ServerName, RegionServerInfo>(); private ServerManager serverManager; private Abortable abortable; @@ -84,7 +84,7 @@ public class RegionServerTracker extends ZooKeeperListener { try { String nodePath = ZKUtil.joinZNode(watcher.rsZNode, n); byte[] data = ZKUtil.getData(watcher, nodePath); - LOG.info("Rs node: " + nodePath + " data: " + Bytes.toString(data)); + LOG.info("Added tracking of RS " + nodePath); if (data != null && data.length > 0 && ProtobufUtil.isPBMagicPrefix(data)) { int magicLen = ProtobufUtil.lengthOfPBMagic(); rsInfoBuilder.mergeFrom(data, magicLen, data.length - magicLen); @@ -141,7 +141,7 @@ public class RegionServerTracker extends ZooKeeperListener { public RegionServerInfo getRegionServerInfo(final ServerName sn) { return regionServers.get(sn); } - + /** * Gets the online servers. * @return list of online servers
