You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/12/17 15:17:55 UTC

[16/28] hbase-site git commit: Published site at .

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html
index 47e8208..d04a726 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/RegionNormalizerTracker.html
@@ -26,25 +26,25 @@
 <span class="sourceLineNo">018</span><a name="line.18"></a>
 <span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.zookeeper;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.commons.logging.Log;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.commons.logging.LogFactory;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.Abortable;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionNormalizerProtos;<a name="line.26"></a>
+<span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Abortable;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.zookeeper.KeeperException;<a name="line.28"></a>
 <span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.io.IOException;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Tracks region normalizer state up in ZK<a name="line.33"></a>
-<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span class="sourceLineNo">035</span>public class RegionNormalizerTracker extends ZKNodeTracker {<a name="line.35"></a>
-<span class="sourceLineNo">036</span>  private static final Log LOG = LogFactory.getLog(RegionNormalizerTracker.class);<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>  public RegionNormalizerTracker(ZKWatcher watcher,<a name="line.38"></a>
-<span class="sourceLineNo">039</span>                             Abortable abortable) {<a name="line.39"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionNormalizerProtos;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * Tracks region normalizer state up in ZK<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public class RegionNormalizerTracker extends ZKNodeTracker {<a name="line.36"></a>
+<span class="sourceLineNo">037</span>  private static final Log LOG = LogFactory.getLog(RegionNormalizerTracker.class);<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public RegionNormalizerTracker(ZKWatcher watcher, Abortable abortable) {<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    super(watcher, watcher.znodePaths.regionNormalizerZNode, abortable);<a name="line.40"></a>
 <span class="sourceLineNo">041</span>  }<a name="line.41"></a>
 <span class="sourceLineNo">042</span><a name="line.42"></a>
@@ -67,7 +67,7 @@
 <span class="sourceLineNo">059</span>  /**<a name="line.59"></a>
 <span class="sourceLineNo">060</span>   * Set region normalizer on/off<a name="line.60"></a>
 <span class="sourceLineNo">061</span>   * @param normalizerOn whether normalizer should be on or off<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * @throws KeeperException<a name="line.62"></a>
+<span class="sourceLineNo">062</span>   * @throws KeeperException if a ZooKeeper operation fails<a name="line.62"></a>
 <span class="sourceLineNo">063</span>   */<a name="line.63"></a>
 <span class="sourceLineNo">064</span>  public void setNormalizerOn(boolean normalizerOn) throws KeeperException {<a name="line.64"></a>
 <span class="sourceLineNo">065</span>    byte [] upData = toByteArray(normalizerOn);<a name="line.65"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKAclReset.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKAclReset.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKAclReset.html
index 8190d2e..84a3ae7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKAclReset.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKAclReset.html
@@ -34,9 +34,9 @@
 <span class="sourceLineNo">026</span>import org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configured;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.util.Tool;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.util.ToolRunner;<a name="line.31"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.util.Tool;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.util.ToolRunner;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.apache.zookeeper.ZooDefs;<a name="line.32"></a>
 <span class="sourceLineNo">033</span>import org.apache.zookeeper.ZooKeeper;<a name="line.33"></a>
 <span class="sourceLineNo">034</span><a name="line.34"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKClusterId.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKClusterId.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKClusterId.html
index 630054e..1b28843 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKClusterId.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKClusterId.html
@@ -31,8 +31,8 @@
 <span class="sourceLineNo">023</span><a name="line.23"></a>
 <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Abortable;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.ClusterId;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.27"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.zookeeper.KeeperException;<a name="line.28"></a>
 <span class="sourceLineNo">029</span><a name="line.29"></a>
 <span class="sourceLineNo">030</span>/**<a name="line.30"></a>
@@ -98,7 +98,7 @@
 <span class="sourceLineNo">090</span>   * Get the UUID for the provided ZK watcher. Doesn't handle any ZK exceptions<a name="line.90"></a>
 <span class="sourceLineNo">091</span>   * @param zkw watcher connected to an ensemble<a name="line.91"></a>
 <span class="sourceLineNo">092</span>   * @return the UUID read from zookeeper<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * @throws KeeperException<a name="line.93"></a>
+<span class="sourceLineNo">093</span>   * @throws KeeperException if a ZooKeeper operation fails<a name="line.93"></a>
 <span class="sourceLineNo">094</span>   */<a name="line.94"></a>
 <span class="sourceLineNo">095</span>  public static UUID getUUIDForCluster(ZKWatcher zkw) throws KeeperException {<a name="line.95"></a>
 <span class="sourceLineNo">096</span>    String uuid = readClusterIdZNode(zkw);<a name="line.96"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
index 2d97db3..bf31a41 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.html
@@ -31,8 +31,8 @@
 <span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Stoppable;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.27"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.zookeeper.KeeperException;<a name="line.28"></a>
 <span class="sourceLineNo">029</span><a name="line.29"></a>
 <span class="sourceLineNo">030</span>/**<a name="line.30"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html
index 4ccd67d..89c161c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain.html
@@ -84,54 +84,58 @@
 <span class="sourceLineNo">076</span>  }<a name="line.76"></a>
 <span class="sourceLineNo">077</span><a name="line.77"></a>
 <span class="sourceLineNo">078</span>  /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   * @param args<a name="line.79"></a>
+<span class="sourceLineNo">079</span>   * @param args the arguments to check<a name="line.79"></a>
 <span class="sourceLineNo">080</span>   * @return True if argument strings have a '-server' in them.<a name="line.80"></a>
 <span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private static boolean hasServer(final String args[]) {<a name="line.82"></a>
+<span class="sourceLineNo">082</span>  private static boolean hasServer(final String[] args) {<a name="line.82"></a>
 <span class="sourceLineNo">083</span>    return args.length &gt; 0 &amp;&amp; args[0].equals(SERVER_ARG);<a name="line.83"></a>
 <span class="sourceLineNo">084</span>  }<a name="line.84"></a>
 <span class="sourceLineNo">085</span><a name="line.85"></a>
 <span class="sourceLineNo">086</span>  /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @param args<a name="line.87"></a>
+<span class="sourceLineNo">087</span>   * @param args the arguments to check for command-line arguments<a name="line.87"></a>
 <span class="sourceLineNo">088</span>   * @return True if command-line arguments were passed.<a name="line.88"></a>
 <span class="sourceLineNo">089</span>   */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static boolean hasCommandLineArguments(final String args[]) {<a name="line.90"></a>
+<span class="sourceLineNo">090</span>  private static boolean hasCommandLineArguments(final String[] args) {<a name="line.90"></a>
 <span class="sourceLineNo">091</span>    if (hasServer(args)) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      if (args.length &lt; 2) throw new IllegalStateException("-server param but no value");<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return args.length &gt; 2;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    return args.length &gt; 0;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Run the tool.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @param args Command line arguments. First arg is path to zookeepers file.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public static void main(String args[]) throws Exception {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    String [] newArgs = args;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    if (!hasServer(args)) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      // Add the zk ensemble from configuration if none passed on command-line.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      Configuration conf = HBaseConfiguration.create();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      String hostport = new ZKMainServer().parse(conf);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      if (hostport != null &amp;&amp; hostport.length() &gt; 0) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        newArgs = new String[args.length + 2];<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        System.arraycopy(args, 0, newArgs, 2, args.length);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        newArgs[0] = "-server";<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        newArgs[1] = hostport;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    // If command-line arguments, run our hack so they are executed.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    // ZOOKEEPER-1897 was committed to zookeeper-3.4.6 but elsewhere in this class we say<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    // 3.4.6 breaks command-processing; TODO.<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    if (hasCommandLineArguments(args)) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain zkm =<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        new HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(newArgs);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      zkm.runCmdLine();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    } else {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      ZooKeeperMain.main(newArgs);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>}<a name="line.126"></a>
+<span class="sourceLineNo">092</span>      if (args.length &lt; 2) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        throw new IllegalStateException("-server param but no value");<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>      return args.length &gt; 2;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    return args.length &gt; 0;<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * Run the tool.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * @param args Command line arguments. First arg is path to zookeepers file.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public static void main(String[] args) throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    String [] newArgs = args;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    if (!hasServer(args)) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      // Add the zk ensemble from configuration if none passed on command-line.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      Configuration conf = HBaseConfiguration.create();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      String hostport = new ZKMainServer().parse(conf);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      if (hostport != null &amp;&amp; hostport.length() &gt; 0) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        newArgs = new String[args.length + 2];<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        System.arraycopy(args, 0, newArgs, 2, args.length);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        newArgs[0] = "-server";<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        newArgs[1] = hostport;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    // If command-line arguments, run our hack so they are executed.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    // ZOOKEEPER-1897 was committed to zookeeper-3.4.6 but elsewhere in this class we say<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    // 3.4.6 breaks command-processing; TODO.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    if (hasCommandLineArguments(args)) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain zkm =<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        new HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(newArgs);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      zkm.runCmdLine();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    } else {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      ZooKeeperMain.main(newArgs);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>}<a name="line.130"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.html
index 4ccd67d..89c161c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKMainServer.html
@@ -84,54 +84,58 @@
 <span class="sourceLineNo">076</span>  }<a name="line.76"></a>
 <span class="sourceLineNo">077</span><a name="line.77"></a>
 <span class="sourceLineNo">078</span>  /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   * @param args<a name="line.79"></a>
+<span class="sourceLineNo">079</span>   * @param args the arguments to check<a name="line.79"></a>
 <span class="sourceLineNo">080</span>   * @return True if argument strings have a '-server' in them.<a name="line.80"></a>
 <span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private static boolean hasServer(final String args[]) {<a name="line.82"></a>
+<span class="sourceLineNo">082</span>  private static boolean hasServer(final String[] args) {<a name="line.82"></a>
 <span class="sourceLineNo">083</span>    return args.length &gt; 0 &amp;&amp; args[0].equals(SERVER_ARG);<a name="line.83"></a>
 <span class="sourceLineNo">084</span>  }<a name="line.84"></a>
 <span class="sourceLineNo">085</span><a name="line.85"></a>
 <span class="sourceLineNo">086</span>  /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   * @param args<a name="line.87"></a>
+<span class="sourceLineNo">087</span>   * @param args the arguments to check for command-line arguments<a name="line.87"></a>
 <span class="sourceLineNo">088</span>   * @return True if command-line arguments were passed.<a name="line.88"></a>
 <span class="sourceLineNo">089</span>   */<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static boolean hasCommandLineArguments(final String args[]) {<a name="line.90"></a>
+<span class="sourceLineNo">090</span>  private static boolean hasCommandLineArguments(final String[] args) {<a name="line.90"></a>
 <span class="sourceLineNo">091</span>    if (hasServer(args)) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      if (args.length &lt; 2) throw new IllegalStateException("-server param but no value");<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return args.length &gt; 2;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    return args.length &gt; 0;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * Run the tool.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @param args Command line arguments. First arg is path to zookeepers file.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   */<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public static void main(String args[]) throws Exception {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    String [] newArgs = args;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    if (!hasServer(args)) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      // Add the zk ensemble from configuration if none passed on command-line.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      Configuration conf = HBaseConfiguration.create();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      String hostport = new ZKMainServer().parse(conf);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      if (hostport != null &amp;&amp; hostport.length() &gt; 0) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        newArgs = new String[args.length + 2];<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        System.arraycopy(args, 0, newArgs, 2, args.length);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        newArgs[0] = "-server";<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        newArgs[1] = hostport;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    // If command-line arguments, run our hack so they are executed.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    // ZOOKEEPER-1897 was committed to zookeeper-3.4.6 but elsewhere in this class we say<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    // 3.4.6 breaks command-processing; TODO.<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    if (hasCommandLineArguments(args)) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain zkm =<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        new HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(newArgs);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      zkm.runCmdLine();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    } else {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      ZooKeeperMain.main(newArgs);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>}<a name="line.126"></a>
+<span class="sourceLineNo">092</span>      if (args.length &lt; 2) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        throw new IllegalStateException("-server param but no value");<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>      return args.length &gt; 2;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    return args.length &gt; 0;<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * Run the tool.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * @param args Command line arguments. First arg is path to zookeepers file.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public static void main(String[] args) throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    String [] newArgs = args;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    if (!hasServer(args)) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      // Add the zk ensemble from configuration if none passed on command-line.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      Configuration conf = HBaseConfiguration.create();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      String hostport = new ZKMainServer().parse(conf);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      if (hostport != null &amp;&amp; hostport.length() &gt; 0) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        newArgs = new String[args.length + 2];<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        System.arraycopy(args, 0, newArgs, 2, args.length);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        newArgs[0] = "-server";<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        newArgs[1] = hostport;<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    // If command-line arguments, run our hack so they are executed.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    // ZOOKEEPER-1897 was committed to zookeeper-3.4.6 but elsewhere in this class we say<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    // 3.4.6 breaks command-processing; TODO.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    if (hasCommandLineArguments(args)) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain zkm =<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        new HACK_UNTIL_ZOOKEEPER_1897_ZooKeeperMain(newArgs);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      zkm.runCmdLine();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    } else {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      ZooKeeperMain.main(newArgs);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>}<a name="line.130"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html
index 4227920..511563d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKNodeTracker.html
@@ -61,202 +61,208 @@
 <span class="sourceLineNo">053</span>   *<a name="line.53"></a>
 <span class="sourceLineNo">054</span>   * &lt;p&gt;After construction, use {@link #start} to kick off tracking.<a name="line.54"></a>
 <span class="sourceLineNo">055</span>   *<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * @param watcher<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * @param node<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   * @param abortable<a name="line.58"></a>
-<span class="sourceLineNo">059</span>   */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public ZKNodeTracker(ZKWatcher watcher, String node,<a name="line.60"></a>
-<span class="sourceLineNo">061</span>                       Abortable abortable) {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    super(watcher);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    this.node = node;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    this.abortable = abortable;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    this.data = null;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span>   * Starts the tracking of the node in ZooKeeper.<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   *<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * &lt;p&gt;Use {@link #blockUntilAvailable()} to block until the node is available<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * or {@link #getData(boolean)} to get the data of the node if it is available.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public synchronized void start() {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    this.watcher.registerListener(this);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    try {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      if(ZKUtil.watchAndCheckExists(watcher, node)) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>        byte [] data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>        if(data != null) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>          this.data = data;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        } else {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>          // It existed but now does not, try again to ensure a watch is set<a name="line.82"></a>
-<span class="sourceLineNo">083</span>          LOG.debug("Try starting again because there is no data from " + node);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>          start();<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        }<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      }<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    } catch (KeeperException e) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      abortable.abort("Unexpected exception during initialization, aborting", e);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public synchronized void stop() {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    this.stopped = true;<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    notifyAll();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   * Gets the data of the node, blocking until the node is available.<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   *<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * @return data of the node<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * @throws InterruptedException if the waiting thread is interrupted<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   */<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  public synchronized byte [] blockUntilAvailable()<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  throws InterruptedException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    return blockUntilAvailable(0, false);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span>  /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   * Gets the data of the node, blocking until the node is available or the<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   * specified timeout has elapsed.<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   *<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * @param timeout maximum time to wait for the node data to be available,<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * n milliseconds.  Pass 0 for no timeout.<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @return data of the node<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @throws InterruptedException if the waiting thread is interrupted<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  public synchronized byte [] blockUntilAvailable(long timeout, boolean refresh)<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  throws InterruptedException {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    if (timeout &lt; 0) throw new IllegalArgumentException();<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    boolean notimeout = timeout == 0;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    long startTime = System.currentTimeMillis();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    long remaining = timeout;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    if (refresh) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      try {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>        // This does not create a watch if the node does not exists<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        this.data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      } catch(KeeperException e) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        // We use to abort here, but in some cases the abort is ignored (<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        //  (empty Abortable), so it's better to log...<a name="line.129"></a>
-<span class="sourceLineNo">130</span>        LOG.warn("Unexpected exception handling blockUntilAvailable", e);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        abortable.abort("Unexpected exception handling blockUntilAvailable", e);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    boolean nodeExistsChecked = (!refresh ||data!=null);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    while (!this.stopped &amp;&amp; (notimeout || remaining &gt; 0) &amp;&amp; this.data == null) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      if (!nodeExistsChecked) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        try {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>          nodeExistsChecked = (ZKUtil.checkExists(watcher, node) != -1);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>        } catch (KeeperException e) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>          LOG.warn(<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            "Got exception while trying to check existence in  ZooKeeper" +<a name="line.141"></a>
-<span class="sourceLineNo">142</span>            " of the node: "+node+", retrying if timeout not reached",e );<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>        // It did not exists, and now it does.<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        if (nodeExistsChecked){<a name="line.146"></a>
-<span class="sourceLineNo">147</span>          LOG.debug("Node " + node + " now exists, resetting a watcher");<a name="line.147"></a>
-<span class="sourceLineNo">148</span>          try {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>            // This does not create a watch if the node does not exists<a name="line.149"></a>
-<span class="sourceLineNo">150</span>            this.data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>          } catch (KeeperException e) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>            LOG.warn("Unexpected exception handling blockUntilAvailable", e);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>            abortable.abort("Unexpected exception handling blockUntilAvailable", e);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>          }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      // We expect a notification; but we wait with a<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      //  a timeout to lower the impact of a race condition if any<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      wait(100);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      remaining = timeout - (System.currentTimeMillis() - startTime);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    return this.data;<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  /**<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * Gets the data of the node.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   *<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * &lt;p&gt;If the node is currently available, the most up-to-date known version of<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   * the data is returned.  If the node is not currently available, null is<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   * returned.<a name="line.170"></a>
-<span class="sourceLineNo">171</span>   * @param refresh whether to refresh the data by calling ZK directly.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * @return data of the node, null if unavailable<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  public synchronized byte [] getData(boolean refresh) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    if (refresh) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      try {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        this.data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      } catch(KeeperException e) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        abortable.abort("Unexpected exception handling getData", e);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    return this.data;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  public String getNode() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    return this.node;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>  }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span>  @Override<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  public synchronized void nodeCreated(String path) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    if (!path.equals(node)) return;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    try {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      byte [] data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      if (data != null) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        this.data = data;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        notifyAll();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      } else {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        nodeDeleted(path);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    } catch(KeeperException e) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      abortable.abort("Unexpected exception handling nodeCreated event", e);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>  @Override<a name="line.205"></a>
-<span class="sourceLineNo">206</span>  public synchronized void nodeDeleted(String path) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    if(path.equals(node)) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      try {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        if(ZKUtil.watchAndCheckExists(watcher, node)) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          nodeCreated(path);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        } else {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          this.data = null;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      } catch(KeeperException e) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        abortable.abort("Unexpected exception handling nodeDeleted event", e);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  public synchronized void nodeDataChanged(String path) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    if(path.equals(node)) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      nodeCreated(path);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  /**<a name="line.227"></a>
-<span class="sourceLineNo">228</span>   * Checks if the baseznode set as per the property 'zookeeper.znode.parent'<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * exists.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * @return true if baseznode exists.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   *         false if doesnot exists.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   */<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  public boolean checkIfBaseNodeAvailable() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    try {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      if (ZKUtil.checkExists(watcher, watcher.znodePaths.baseZNode) == -1) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        return false;<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      }<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    } catch (KeeperException e) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      abortable.abort("Exception while checking if basenode (" + watcher.znodePaths.baseZNode<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          + ") exists in ZooKeeper.",<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        e);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    return true;<a name="line.243"></a>
-<span class="sourceLineNo">244</span>  }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>  @Override<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  public String toString() {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    return "ZKNodeTracker{" +<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        "node='" + node + ", stopped=" + stopped + '}';<a name="line.249"></a>
+<span class="sourceLineNo">056</span>   * @param watcher reference to the {@link ZKWatcher} which also contains configuration and<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   *                constants<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   * @param node path of the node being tracked<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * @param abortable used to abort if a fatal error occurs<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public ZKNodeTracker(ZKWatcher watcher, String node,<a name="line.61"></a>
+<span class="sourceLineNo">062</span>                       Abortable abortable) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    super(watcher);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    this.node = node;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    this.abortable = abortable;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    this.data = null;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  /**<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   * Starts the tracking of the node in ZooKeeper.<a name="line.70"></a>
+<span class="sourceLineNo">071</span>   *<a name="line.71"></a>
+<span class="sourceLineNo">072</span>   * &lt;p&gt;Use {@link #blockUntilAvailable()} to block until the node is available<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * or {@link #getData(boolean)} to get the data of the node if it is available.<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   */<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public synchronized void start() {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    this.watcher.registerListener(this);<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    try {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      if(ZKUtil.watchAndCheckExists(watcher, node)) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        byte [] data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        if(data != null) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>          this.data = data;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>        } else {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>          // It existed but now does not, try again to ensure a watch is set<a name="line.83"></a>
+<span class="sourceLineNo">084</span>          LOG.debug("Try starting again because there is no data from " + node);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          start();<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    } catch (KeeperException e) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      abortable.abort("Unexpected exception during initialization, aborting", e);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  public synchronized void stop() {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    this.stopped = true;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    notifyAll();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
+<span class="sourceLineNo">099</span>   * Gets the data of the node, blocking until the node is available.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   *<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * @return data of the node<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * @throws InterruptedException if the waiting thread is interrupted<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   */<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  public synchronized byte [] blockUntilAvailable()<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  throws InterruptedException {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    return blockUntilAvailable(0, false);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>  /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span>   * Gets the data of the node, blocking until the node is available or the<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * specified timeout has elapsed.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   *<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * @param timeout maximum time to wait for the node data to be available, n milliseconds. Pass 0<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   *                for no timeout.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @return data of the node<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * @throws InterruptedException if the waiting thread is interrupted<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  public synchronized byte [] blockUntilAvailable(long timeout, boolean refresh)<a name="line.118"></a>
+<span class="sourceLineNo">119</span>          throws InterruptedException {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    if (timeout &lt; 0) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      throw new IllegalArgumentException();<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>    boolean notimeout = timeout == 0;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    long startTime = System.currentTimeMillis();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    long remaining = timeout;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    if (refresh) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        // This does not create a watch if the node does not exists<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        this.data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      } catch(KeeperException e) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        // We use to abort here, but in some cases the abort is ignored (<a name="line.132"></a>
+<span class="sourceLineNo">133</span>        //  (empty Abortable), so it's better to log...<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        LOG.warn("Unexpected exception handling blockUntilAvailable", e);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        abortable.abort("Unexpected exception handling blockUntilAvailable", e);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    boolean nodeExistsChecked = (!refresh ||data!=null);<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    while (!this.stopped &amp;&amp; (notimeout || remaining &gt; 0) &amp;&amp; this.data == null) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      if (!nodeExistsChecked) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        try {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>          nodeExistsChecked = (ZKUtil.checkExists(watcher, node) != -1);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        } catch (KeeperException e) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>          LOG.warn("Got exception while trying to check existence in  ZooKeeper" +<a name="line.144"></a>
+<span class="sourceLineNo">145</span>            " of the node: " + node + ", retrying if timeout not reached", e);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>        // It did not exists, and now it does.<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        if (nodeExistsChecked){<a name="line.149"></a>
+<span class="sourceLineNo">150</span>          LOG.debug("Node " + node + " now exists, resetting a watcher");<a name="line.150"></a>
+<span class="sourceLineNo">151</span>          try {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            // This does not create a watch if the node does not exists<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            this.data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.153"></a>
+<span class="sourceLineNo">154</span>          } catch (KeeperException e) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>            LOG.warn("Unexpected exception handling blockUntilAvailable", e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>            abortable.abort("Unexpected exception handling blockUntilAvailable", e);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        }<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      // We expect a notification; but we wait with a<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      //  a timeout to lower the impact of a race condition if any<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      wait(100);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      remaining = timeout - (System.currentTimeMillis() - startTime);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    return this.data;<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  /**<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * Gets the data of the node.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   *<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * &lt;p&gt;If the node is currently available, the most up-to-date known version of<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * the data is returned.  If the node is not currently available, null is<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * returned.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @param refresh whether to refresh the data by calling ZK directly.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * @return data of the node, null if unavailable<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  public synchronized byte [] getData(boolean refresh) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    if (refresh) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      try {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        this.data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      } catch(KeeperException e) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        abortable.abort("Unexpected exception handling getData", e);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      }<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    return this.data;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>  public String getNode() {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    return this.node;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  @Override<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  public synchronized void nodeCreated(String path) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    if (!path.equals(node)) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      return;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>    try {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      byte [] data = ZKUtil.getDataAndWatch(watcher, node);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      if (data != null) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        this.data = data;<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        notifyAll();<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      } else {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        nodeDeleted(path);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    } catch(KeeperException e) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      abortable.abort("Unexpected exception handling nodeCreated event", e);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>  @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span>  public synchronized void nodeDeleted(String path) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    if(path.equals(node)) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      try {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        if(ZKUtil.watchAndCheckExists(watcher, node)) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>          nodeCreated(path);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        } else {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>          this.data = null;<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      } catch(KeeperException e) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        abortable.abort("Unexpected exception handling nodeDeleted event", e);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      }<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    }<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>  @Override<a name="line.226"></a>
+<span class="sourceLineNo">227</span>  public synchronized void nodeDataChanged(String path) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    if(path.equals(node)) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      nodeCreated(path);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>  /**<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * Checks if the baseznode set as per the property 'zookeeper.znode.parent'<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * exists.<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @return true if baseznode exists.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   *         false if doesnot exists.<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   */<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  public boolean checkIfBaseNodeAvailable() {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    try {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      if (ZKUtil.checkExists(watcher, watcher.znodePaths.baseZNode) == -1) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        return false;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    } catch (KeeperException e) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      abortable.abort("Exception while checking if basenode (" + watcher.znodePaths.baseZNode<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          + ") exists in ZooKeeper.",<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        e);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    return true;<a name="line.249"></a>
 <span class="sourceLineNo">250</span>  }<a name="line.250"></a>
-<span class="sourceLineNo">251</span>}<a name="line.251"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>  @Override<a name="line.252"></a>
+<span class="sourceLineNo">253</span>  public String toString() {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    return "ZKNodeTracker{" +<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        "node='" + node + ", stopped=" + stopped + '}';<a name="line.255"></a>
+<span class="sourceLineNo">256</span>  }<a name="line.256"></a>
+<span class="sourceLineNo">257</span>}<a name="line.257"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/48bd3915/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKServerTool.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKServerTool.html b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKServerTool.html
index e58acb6..fe41f3b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKServerTool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/zookeeper/ZKServerTool.html
@@ -27,50 +27,53 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.zookeeper;<a name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.ServerName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.LinkedList;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a>
+<span class="sourceLineNo">022</span>import java.util.LinkedList;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.List;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.conf.Configuration;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HConstants;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.ServerName;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
 <span class="sourceLineNo">032</span>/**<a name="line.32"></a>
 <span class="sourceLineNo">033</span> * Tool for reading ZooKeeper servers from HBase XML configuration and producing<a name="line.33"></a>
 <span class="sourceLineNo">034</span> * a line-by-line list for use by bash scripts.<a name="line.34"></a>
 <span class="sourceLineNo">035</span> */<a name="line.35"></a>
 <span class="sourceLineNo">036</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public class ZKServerTool {<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  public static ServerName[] readZKNodes(Configuration conf) {<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    List&lt;ServerName&gt; hosts = new LinkedList&lt;&gt;();<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    String quorum = conf.get(HConstants.ZOOKEEPER_QUORUM, HConstants.LOCALHOST);<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>    String[] values = quorum.split(",");<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    for (String value : values) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span>      String[] parts = value.split(":");<a name="line.44"></a>
-<span class="sourceLineNo">045</span>      String host = parts[0];<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      int port = HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      if (parts.length &gt; 1) {<a name="line.47"></a>
-<span class="sourceLineNo">048</span>        port = Integer.parseInt(parts[1]);<a name="line.48"></a>
-<span class="sourceLineNo">049</span>      }<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      hosts.add(ServerName.valueOf(host, port, -1));<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    }<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    return hosts.toArray(new ServerName[hosts.size()]);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  }<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * Run the tool.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * @param args Command line arguments.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public static void main(String args[]) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    for(ServerName server: readZKNodes(HBaseConfiguration.create())) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      // bin/zookeeper.sh relies on the "ZK host" string for grepping which is case sensitive.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      System.out.println("ZK host: " + server.getHostname());<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    }<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
-<span class="sourceLineNo">065</span>}<a name="line.65"></a>
+<span class="sourceLineNo">037</span>public final class ZKServerTool {<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  private ZKServerTool() {<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  }<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>  public static ServerName[] readZKNodes(Configuration conf) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    List&lt;ServerName&gt; hosts = new LinkedList&lt;&gt;();<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    String quorum = conf.get(HConstants.ZOOKEEPER_QUORUM, HConstants.LOCALHOST);<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>    String[] values = quorum.split(",");<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    for (String value : values) {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      String[] parts = value.split(":");<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      String host = parts[0];<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      int port = HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      if (parts.length &gt; 1) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>        port = Integer.parseInt(parts[1]);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      }<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      hosts.add(ServerName.valueOf(host, port, -1));<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    }<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    return hosts.toArray(new ServerName[hosts.size()]);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * Run the tool.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   * @param args Command line arguments.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  public static void main(String[] args) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    for(ServerName server: readZKNodes(HBaseConfiguration.create())) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      // bin/zookeeper.sh relies on the "ZK host" string for grepping which is case sensitive.<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      System.out.println("ZK host: " + server.getHostname());<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    }<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>}<a name="line.68"></a>