svn commit: r1000698 - in /hbase/trunk: CHANGES.txt bin/zookeepers.sh src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java

[todd]

Author: todd
Date: Fri Sep 24 04:10:55 2010
New Revision: 1000698

URL: http://svn.apache.org/viewvc?rev=1000698&view=rev
Log:
HBASE-3002. Fix zookeepers.sh to work properly with strange JVM options

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/bin/zookeepers.sh
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1000698&r1=1000697&r2=1000698&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Sep 24 04:10:55 2010
@@ -536,6 +536,7 @@ Release 0.21.0 - Unreleased
    HBASE-3024  NPE processing server crash in MetaEditor.addDaughter
    HBASE-3026  Fixup of "missing" daughters on split is too aggressive
    HBASE-3003  ClassSize constants dont use 'final'
+   HBASE-3002  Fix zookeepers.sh to work properly with strange JVM options
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hbase/trunk/bin/zookeepers.sh
URL: 
http://svn.apache.org/viewvc/hbase/trunk/bin/zookeepers.sh?rev=1000698&r1=1000697&r2=1000698&view=diff
==============================================================================
--- hbase/trunk/bin/zookeepers.sh (original)
+++ hbase/trunk/bin/zookeepers.sh Fri Sep 24 04:10:55 2010
@@ -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: /" &

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java?rev=1000698&r1=1000697&r2=1000698&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java 
(original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKServerTool.java 
Fri Sep 24 04:10:55 2010
@@ -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);
       }
     }
   }