commit 63704c802d63edf2f7a9df864ca9c918aebc2e45 Author: Todd Lipcon Date: Wed Jul 28 22:44:16 2010 -0700 Fix ZKServerTool to work even when running with various verbose JVM options diff --git bin/zookeepers.sh bin/zookeepers.sh index 3e62e45..89a214e 100755 --- bin/zookeepers.sh +++ bin/zookeepers.sh @@ -48,7 +48,7 @@ if [ "$HBASE_MANAGES_ZK" = "" ]; then fi if [ "$HBASE_MANAGES_ZK" = "true" ]; then - hosts=`"$bin"/hbase org.apache.hadoop.hbase.zookeeper.ZKServerTool` + hosts=`"$bin"/hbase org.apache.hadoop.hbase.zookeeper.ZKServerTool | grep '^ZK host:' | sed 's,^ZK host:,,'` cmd=$"${@// /\\ }" for zookeeper in $hosts; do ssh $HBASE_SSH_OPTS $zookeeper $cmd 2>&1 | sed "s/^/$zookeeper: /" & diff --git src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java index ae1c34e..ae8a8a1 100644 --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java @@ -47,7 +47,7 @@ public class ZKServerTool { if (key.startsWith("server.")) { String[] parts = value.split(":"); String host = parts[0]; - System.out.println(host); + System.out.println("ZK host:" + host); } } }