Author: stack
Date: Wed Nov 24 23:28:56 2010
New Revision: 1038870
URL: http://svn.apache.org/viewvc?rev=1038870&view=rev
Log:
HBASE-3277 HBase Shell zk_dump command broken
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
hbase/trunk/src/main/ruby/hbase/admin.rb
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1038870&r1=1038869&r2=1038870&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Nov 24 23:28:56 2010
@@ -712,6 +712,7 @@ Release 0.90.0 - Unreleased
is now async by default
HBASE-3275 [rest] No gzip/deflate content encoding support
HBASE-3261 NPE out of HRS.run at startup when clock is out of sync
+ HBASE-3277 HBase Shell zk_dump command broken
IMPROVEMENTS
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java?rev=1038870&r1=1038869&r2=1038870&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java Wed
Nov 24 23:28:56 2010
@@ -1027,33 +1027,32 @@ public class ZKUtil {
public static String dump(ZooKeeperWatcher zkw) {
StringBuilder sb = new StringBuilder();
try {
- sb.append("\nHBase tree in ZooKeeper is rooted at
").append(zkw.baseZNode);
- sb.append("\n Cluster up? ").append(checkExists(zkw,
zkw.clusterStateZNode));
- sb.append("\n Master address: ").append(
+ sb.append("HBase is rooted at ").append(zkw.baseZNode);
+ sb.append("\nMaster address: ").append(
getDataAsAddress(zkw, zkw.masterAddressZNode));
- sb.append("\n Region server holding ROOT: ").append(
+ sb.append("\nRegion server holding ROOT: ").append(
getDataAsAddress(zkw, zkw.rootServerZNode));
- sb.append("\n Region servers:");
+ sb.append("\nRegion servers:");
for (HServerAddress address : listChildrenAndGetAsAddresses(zkw,
zkw.rsZNode)) {
- sb.append("\n - ").append(address);
+ sb.append("\n ").append(address);
}
- sb.append("\n Quorum Server Statistics:");
+ sb.append("\nQuorum Server Statistics:");
String[] servers = zkw.getQuorum().split(",");
for (String server : servers) {
- sb.append("\n - ").append(server);
+ sb.append("\n ").append(server);
try {
String[] stat = getServerStats(server);
for (String s : stat) {
- sb.append("\n ").append(s);
+ sb.append("\n ").append(s);
}
} catch (Exception e) {
- sb.append("\n ERROR: ").append(e.getMessage());
+ sb.append("\n ERROR: ").append(e.getMessage());
}
}
} catch(KeeperException ke) {
- sb.append("\n FATAL ZooKeeper Exception!\n");
- sb.append("\n " + ke.getMessage());
+ sb.append("\nFATAL ZooKeeper Exception!\n");
+ sb.append("\n" + ke.getMessage());
}
return sb.toString();
}
Modified: hbase/trunk/src/main/ruby/hbase/admin.rb
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/ruby/hbase/admin.rb?rev=1038870&r1=1038869&r2=1038870&view=diff
==============================================================================
--- hbase/trunk/src/main/ruby/hbase/admin.rb (original)
+++ hbase/trunk/src/main/ruby/hbase/admin.rb Wed Nov 24 23:28:56 2010
@@ -106,7 +106,7 @@ module Hbase
#----------------------------------------------------------------------------------------------
# Returns ZooKeeper status dump
def zk_dump
- @zk_wrapper.dump
+ org.apache.hadoop.hbase.zookeeper.ZKUtil::dump(@zk_wrapper)
end
#----------------------------------------------------------------------------------------------
