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 2018/06/02 14:47:42 UTC
[06/44] hbase-site git commit: Published site at
8377873d22c25185127bc07ea055412d8e302a1a.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
index ec434e9..403df35 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.MyRegionServer.html
@@ -110,53 +110,54 @@
<span class="sourceLineNo">102</span> // Delete the ephemeral node of the meta-carrying region server.<a name="line.102"></a>
<span class="sourceLineNo">103</span> // This is trigger the expire of this region server on the master.<a name="line.103"></a>
<span class="sourceLineNo">104</span> String rsEphemeralNodePath =<a name="line.104"></a>
-<span class="sourceLineNo">105</span> ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, metaServerName.toString());<a name="line.105"></a>
-<span class="sourceLineNo">106</span> ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.info("Deleted the znode for the RegionServer hosting hbase:meta; waiting on SSH");<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // Wait for SSH to finish<a name="line.108"></a>
-<span class="sourceLineNo">109</span> final ServerManager serverManager = master.getServerManager();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> final ServerName priorMetaServerName = metaServerName;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> TEST_UTIL.waitFor(120000, 200, new Waiter.Predicate<Exception>() {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> @Override<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public boolean evaluate() throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return !serverManager.isServerOnline(priorMetaServerName)<a name="line.114"></a>
-<span class="sourceLineNo">115</span> && !serverManager.areDeadServersInProgress();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> });<a name="line.117"></a>
-<span class="sourceLineNo">118</span> LOG.info("Past wait on RIT");<a name="line.118"></a>
-<span class="sourceLineNo">119</span> TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> // Now, make sure meta is assigned<a name="line.120"></a>
-<span class="sourceLineNo">121</span> assertTrue("Meta should be assigned",<a name="line.121"></a>
-<span class="sourceLineNo">122</span> regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // Now, make sure meta is registered in zk<a name="line.123"></a>
-<span class="sourceLineNo">124</span> metaState = MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a name="line.124"></a>
-<span class="sourceLineNo">125</span> assertEquals("Meta should not be in transition", RegionState.State.OPEN,<a name="line.125"></a>
-<span class="sourceLineNo">126</span> metaState.getState());<a name="line.126"></a>
-<span class="sourceLineNo">127</span> assertEquals("Meta should be assigned", metaState.getServerName(),<a name="line.127"></a>
-<span class="sourceLineNo">128</span> regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertNotEquals("Meta should be assigned on a different server",<a name="line.129"></a>
-<span class="sourceLineNo">130</span> metaState.getServerName(), metaServerName);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> public static class MyRegionServer extends MiniHBaseClusterRegionServer {<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> public MyRegionServer(Configuration conf) throws IOException, KeeperException,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> InterruptedException {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> super(conf);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public void abort(String reason, Throwable cause) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> // sleep to slow down the region server abort<a name="line.142"></a>
-<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> Thread.sleep(30*1000);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> } catch (InterruptedException e) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span> super.abort(reason, cause);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span>}<a name="line.151"></a>
+<span class="sourceLineNo">105</span> ZNodePaths.joinZNode(master.getZooKeeper().getZNodePaths().rsZNode,<a name="line.105"></a>
+<span class="sourceLineNo">106</span> metaServerName.toString());<a name="line.106"></a>
+<span class="sourceLineNo">107</span> ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> LOG.info("Deleted the znode for the RegionServer hosting hbase:meta; waiting on SSH");<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // Wait for SSH to finish<a name="line.109"></a>
+<span class="sourceLineNo">110</span> final ServerManager serverManager = master.getServerManager();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> final ServerName priorMetaServerName = metaServerName;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> TEST_UTIL.waitFor(120000, 200, new Waiter.Predicate<Exception>() {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> @Override<a name="line.113"></a>
+<span class="sourceLineNo">114</span> public boolean evaluate() throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> return !serverManager.isServerOnline(priorMetaServerName)<a name="line.115"></a>
+<span class="sourceLineNo">116</span> && !serverManager.areDeadServersInProgress();<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> LOG.info("Past wait on RIT");<a name="line.119"></a>
+<span class="sourceLineNo">120</span> TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> // Now, make sure meta is assigned<a name="line.121"></a>
+<span class="sourceLineNo">122</span> assertTrue("Meta should be assigned",<a name="line.122"></a>
+<span class="sourceLineNo">123</span> regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.123"></a>
+<span class="sourceLineNo">124</span> // Now, make sure meta is registered in zk<a name="line.124"></a>
+<span class="sourceLineNo">125</span> metaState = MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> assertEquals("Meta should not be in transition", RegionState.State.OPEN,<a name="line.126"></a>
+<span class="sourceLineNo">127</span> metaState.getState());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertEquals("Meta should be assigned", metaState.getServerName(),<a name="line.128"></a>
+<span class="sourceLineNo">129</span> regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.129"></a>
+<span class="sourceLineNo">130</span> assertNotEquals("Meta should be assigned on a different server",<a name="line.130"></a>
+<span class="sourceLineNo">131</span> metaState.getServerName(), metaServerName);<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> public static class MyRegionServer extends MiniHBaseClusterRegionServer {<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> public MyRegionServer(Configuration conf) throws IOException, KeeperException,<a name="line.136"></a>
+<span class="sourceLineNo">137</span> InterruptedException {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> super(conf);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public void abort(String reason, Throwable cause) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> // sleep to slow down the region server abort<a name="line.143"></a>
+<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> Thread.sleep(30*1000);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (InterruptedException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> return;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> super.abort(reason, cause);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>}<a name="line.152"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
index ec434e9..403df35 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaShutdownHandler.html
@@ -110,53 +110,54 @@
<span class="sourceLineNo">102</span> // Delete the ephemeral node of the meta-carrying region server.<a name="line.102"></a>
<span class="sourceLineNo">103</span> // This is trigger the expire of this region server on the master.<a name="line.103"></a>
<span class="sourceLineNo">104</span> String rsEphemeralNodePath =<a name="line.104"></a>
-<span class="sourceLineNo">105</span> ZNodePaths.joinZNode(master.getZooKeeper().znodePaths.rsZNode, metaServerName.toString());<a name="line.105"></a>
-<span class="sourceLineNo">106</span> ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.info("Deleted the znode for the RegionServer hosting hbase:meta; waiting on SSH");<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // Wait for SSH to finish<a name="line.108"></a>
-<span class="sourceLineNo">109</span> final ServerManager serverManager = master.getServerManager();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> final ServerName priorMetaServerName = metaServerName;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> TEST_UTIL.waitFor(120000, 200, new Waiter.Predicate<Exception>() {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> @Override<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public boolean evaluate() throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return !serverManager.isServerOnline(priorMetaServerName)<a name="line.114"></a>
-<span class="sourceLineNo">115</span> && !serverManager.areDeadServersInProgress();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> });<a name="line.117"></a>
-<span class="sourceLineNo">118</span> LOG.info("Past wait on RIT");<a name="line.118"></a>
-<span class="sourceLineNo">119</span> TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> // Now, make sure meta is assigned<a name="line.120"></a>
-<span class="sourceLineNo">121</span> assertTrue("Meta should be assigned",<a name="line.121"></a>
-<span class="sourceLineNo">122</span> regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // Now, make sure meta is registered in zk<a name="line.123"></a>
-<span class="sourceLineNo">124</span> metaState = MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a name="line.124"></a>
-<span class="sourceLineNo">125</span> assertEquals("Meta should not be in transition", RegionState.State.OPEN,<a name="line.125"></a>
-<span class="sourceLineNo">126</span> metaState.getState());<a name="line.126"></a>
-<span class="sourceLineNo">127</span> assertEquals("Meta should be assigned", metaState.getServerName(),<a name="line.127"></a>
-<span class="sourceLineNo">128</span> regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertNotEquals("Meta should be assigned on a different server",<a name="line.129"></a>
-<span class="sourceLineNo">130</span> metaState.getServerName(), metaServerName);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> public static class MyRegionServer extends MiniHBaseClusterRegionServer {<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> public MyRegionServer(Configuration conf) throws IOException, KeeperException,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> InterruptedException {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> super(conf);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public void abort(String reason, Throwable cause) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> // sleep to slow down the region server abort<a name="line.142"></a>
-<span class="sourceLineNo">143</span> try {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> Thread.sleep(30*1000);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> } catch (InterruptedException e) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> return;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span> super.abort(reason, cause);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span>}<a name="line.151"></a>
+<span class="sourceLineNo">105</span> ZNodePaths.joinZNode(master.getZooKeeper().getZNodePaths().rsZNode,<a name="line.105"></a>
+<span class="sourceLineNo">106</span> metaServerName.toString());<a name="line.106"></a>
+<span class="sourceLineNo">107</span> ZKUtil.deleteNode(master.getZooKeeper(), rsEphemeralNodePath);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> LOG.info("Deleted the znode for the RegionServer hosting hbase:meta; waiting on SSH");<a name="line.108"></a>
+<span class="sourceLineNo">109</span> // Wait for SSH to finish<a name="line.109"></a>
+<span class="sourceLineNo">110</span> final ServerManager serverManager = master.getServerManager();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> final ServerName priorMetaServerName = metaServerName;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> TEST_UTIL.waitFor(120000, 200, new Waiter.Predicate<Exception>() {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> @Override<a name="line.113"></a>
+<span class="sourceLineNo">114</span> public boolean evaluate() throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> return !serverManager.isServerOnline(priorMetaServerName)<a name="line.115"></a>
+<span class="sourceLineNo">116</span> && !serverManager.areDeadServersInProgress();<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> LOG.info("Past wait on RIT");<a name="line.119"></a>
+<span class="sourceLineNo">120</span> TEST_UTIL.waitUntilNoRegionsInTransition(60000);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> // Now, make sure meta is assigned<a name="line.121"></a>
+<span class="sourceLineNo">122</span> assertTrue("Meta should be assigned",<a name="line.122"></a>
+<span class="sourceLineNo">123</span> regionStates.isRegionOnline(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.123"></a>
+<span class="sourceLineNo">124</span> // Now, make sure meta is registered in zk<a name="line.124"></a>
+<span class="sourceLineNo">125</span> metaState = MetaTableLocator.getMetaRegionState(master.getZooKeeper());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> assertEquals("Meta should not be in transition", RegionState.State.OPEN,<a name="line.126"></a>
+<span class="sourceLineNo">127</span> metaState.getState());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertEquals("Meta should be assigned", metaState.getServerName(),<a name="line.128"></a>
+<span class="sourceLineNo">129</span> regionStates.getRegionServerOfRegion(HRegionInfo.FIRST_META_REGIONINFO));<a name="line.129"></a>
+<span class="sourceLineNo">130</span> assertNotEquals("Meta should be assigned on a different server",<a name="line.130"></a>
+<span class="sourceLineNo">131</span> metaState.getServerName(), metaServerName);<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> public static class MyRegionServer extends MiniHBaseClusterRegionServer {<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> public MyRegionServer(Configuration conf) throws IOException, KeeperException,<a name="line.136"></a>
+<span class="sourceLineNo">137</span> InterruptedException {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> super(conf);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public void abort(String reason, Throwable cause) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> // sleep to slow down the region server abort<a name="line.143"></a>
+<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> Thread.sleep(30*1000);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (InterruptedException e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> return;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> super.abort(reason, cause);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>}<a name="line.152"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html
index b05574a..b49f1dd 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMirroringTableStateManager.html
@@ -90,27 +90,28 @@
<span class="sourceLineNo">082</span><a name="line.82"></a>
<span class="sourceLineNo">083</span> private TableState.State getTableStateInZK(ZKWatcher watcher, final TableName tableName)<a name="line.83"></a>
<span class="sourceLineNo">084</span> throws KeeperException, IOException, InterruptedException {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> String znode = ZNodePaths.joinZNode(watcher.znodePaths.tableZNode, tableName.getNameAsString());<a name="line.85"></a>
-<span class="sourceLineNo">086</span> byte [] data = ZKUtil.getData(watcher, znode);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> if (data == null || data.length <= 0) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return null;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span> try {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> ZooKeeperProtos.DeprecatedTableState.Builder builder =<a name="line.92"></a>
-<span class="sourceLineNo">093</span> ZooKeeperProtos.DeprecatedTableState.newBuilder();<a name="line.93"></a>
-<span class="sourceLineNo">094</span> int magicLen = ProtobufUtil.lengthOfPBMagic();<a name="line.94"></a>
-<span class="sourceLineNo">095</span> ProtobufUtil.mergeFrom(builder, data, magicLen, data.length - magicLen);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> return TableState.State.valueOf(builder.getState().toString());<a name="line.96"></a>
-<span class="sourceLineNo">097</span> } catch (IOException e) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> KeeperException ke = new KeeperException.DataInconsistencyException();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> ke.initCause(e);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> throw ke;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> } catch (DeserializationException e) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> throw ZKUtil.convert(e);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>}<a name="line.105"></a>
+<span class="sourceLineNo">085</span> String znode = ZNodePaths.joinZNode(watcher.getZNodePaths().tableZNode,<a name="line.85"></a>
+<span class="sourceLineNo">086</span> tableName.getNameAsString());<a name="line.86"></a>
+<span class="sourceLineNo">087</span> byte [] data = ZKUtil.getData(watcher, znode);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> if (data == null || data.length <= 0) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> return null;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span> try {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> ProtobufUtil.expectPBMagicPrefix(data);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> ZooKeeperProtos.DeprecatedTableState.Builder builder =<a name="line.93"></a>
+<span class="sourceLineNo">094</span> ZooKeeperProtos.DeprecatedTableState.newBuilder();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> int magicLen = ProtobufUtil.lengthOfPBMagic();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> ProtobufUtil.mergeFrom(builder, data, magicLen, data.length - magicLen);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return TableState.State.valueOf(builder.getState().toString());<a name="line.97"></a>
+<span class="sourceLineNo">098</span> } catch (IOException e) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> KeeperException ke = new KeeperException.DataInconsistencyException();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> ke.initCause(e);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> throw ke;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> } catch (DeserializationException e) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> throw ZKUtil.convert(e);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>}<a name="line.106"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.DummyMasterServices.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.DummyMasterServices.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.DummyMasterServices.html
index 770d1f3..97afc91 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.DummyMasterServices.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.DummyMasterServices.html
@@ -135,13 +135,13 @@
<span class="sourceLineNo">127</span> new ZKWatcher(conf, "split-log-manager-tests" + UUID.randomUUID().toString(), null);<a name="line.127"></a>
<span class="sourceLineNo">128</span> master = new DummyMasterServices(zkw, conf);<a name="line.128"></a>
<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> ZKUtil.deleteChildrenRecursively(zkw, zkw.znodePaths.baseZNode);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> ZKUtil.createAndFailSilent(zkw, zkw.znodePaths.baseZNode);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertTrue(ZKUtil.checkExists(zkw, zkw.znodePaths.baseZNode) != -1);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> LOG.debug(zkw.znodePaths.baseZNode + " created");<a name="line.133"></a>
-<span class="sourceLineNo">134</span> ZKUtil.createAndFailSilent(zkw, zkw.znodePaths.splitLogZNode);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertTrue(ZKUtil.checkExists(zkw, zkw.znodePaths.splitLogZNode) != -1);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> LOG.debug(zkw.znodePaths.splitLogZNode + " created");<a name="line.136"></a>
+<span class="sourceLineNo">130</span> ZKUtil.deleteChildrenRecursively(zkw, zkw.getZNodePaths().baseZNode);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> ZKUtil.createAndFailSilent(zkw, zkw.getZNodePaths().baseZNode);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertTrue(ZKUtil.checkExists(zkw, zkw.getZNodePaths().baseZNode) != -1);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> LOG.debug(zkw.getZNodePaths().baseZNode + " created");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ZKUtil.createAndFailSilent(zkw, zkw.getZNodePaths().splitLogZNode);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertTrue(ZKUtil.checkExists(zkw, zkw.getZNodePaths().splitLogZNode) != -1);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> LOG.debug(zkw.getZNodePaths().splitLogZNode + " created");<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
<span class="sourceLineNo">138</span> resetCounters();<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.Expr.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.Expr.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.Expr.html
index 770d1f3..97afc91 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.Expr.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.Expr.html
@@ -135,13 +135,13 @@
<span class="sourceLineNo">127</span> new ZKWatcher(conf, "split-log-manager-tests" + UUID.randomUUID().toString(), null);<a name="line.127"></a>
<span class="sourceLineNo">128</span> master = new DummyMasterServices(zkw, conf);<a name="line.128"></a>
<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> ZKUtil.deleteChildrenRecursively(zkw, zkw.znodePaths.baseZNode);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> ZKUtil.createAndFailSilent(zkw, zkw.znodePaths.baseZNode);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertTrue(ZKUtil.checkExists(zkw, zkw.znodePaths.baseZNode) != -1);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> LOG.debug(zkw.znodePaths.baseZNode + " created");<a name="line.133"></a>
-<span class="sourceLineNo">134</span> ZKUtil.createAndFailSilent(zkw, zkw.znodePaths.splitLogZNode);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertTrue(ZKUtil.checkExists(zkw, zkw.znodePaths.splitLogZNode) != -1);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> LOG.debug(zkw.znodePaths.splitLogZNode + " created");<a name="line.136"></a>
+<span class="sourceLineNo">130</span> ZKUtil.deleteChildrenRecursively(zkw, zkw.getZNodePaths().baseZNode);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> ZKUtil.createAndFailSilent(zkw, zkw.getZNodePaths().baseZNode);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertTrue(ZKUtil.checkExists(zkw, zkw.getZNodePaths().baseZNode) != -1);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> LOG.debug(zkw.getZNodePaths().baseZNode + " created");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ZKUtil.createAndFailSilent(zkw, zkw.getZNodePaths().splitLogZNode);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertTrue(ZKUtil.checkExists(zkw, zkw.getZNodePaths().splitLogZNode) != -1);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> LOG.debug(zkw.getZNodePaths().splitLogZNode + " created");<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
<span class="sourceLineNo">138</span> resetCounters();<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.html
index 770d1f3..97afc91 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestSplitLogManager.html
@@ -135,13 +135,13 @@
<span class="sourceLineNo">127</span> new ZKWatcher(conf, "split-log-manager-tests" + UUID.randomUUID().toString(), null);<a name="line.127"></a>
<span class="sourceLineNo">128</span> master = new DummyMasterServices(zkw, conf);<a name="line.128"></a>
<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> ZKUtil.deleteChildrenRecursively(zkw, zkw.znodePaths.baseZNode);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> ZKUtil.createAndFailSilent(zkw, zkw.znodePaths.baseZNode);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertTrue(ZKUtil.checkExists(zkw, zkw.znodePaths.baseZNode) != -1);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> LOG.debug(zkw.znodePaths.baseZNode + " created");<a name="line.133"></a>
-<span class="sourceLineNo">134</span> ZKUtil.createAndFailSilent(zkw, zkw.znodePaths.splitLogZNode);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertTrue(ZKUtil.checkExists(zkw, zkw.znodePaths.splitLogZNode) != -1);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> LOG.debug(zkw.znodePaths.splitLogZNode + " created");<a name="line.136"></a>
+<span class="sourceLineNo">130</span> ZKUtil.deleteChildrenRecursively(zkw, zkw.getZNodePaths().baseZNode);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> ZKUtil.createAndFailSilent(zkw, zkw.getZNodePaths().baseZNode);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertTrue(ZKUtil.checkExists(zkw, zkw.getZNodePaths().baseZNode) != -1);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> LOG.debug(zkw.getZNodePaths().baseZNode + " created");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ZKUtil.createAndFailSilent(zkw, zkw.getZNodePaths().splitLogZNode);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertTrue(ZKUtil.checkExists(zkw, zkw.getZNodePaths().splitLogZNode) != -1);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> LOG.debug(zkw.getZNodePaths().splitLogZNode + " created");<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
<span class="sourceLineNo">138</span> resetCounters();<a name="line.138"></a>
<span class="sourceLineNo">139</span><a name="line.139"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.NodeCreationListener.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.NodeCreationListener.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.NodeCreationListener.html
index b7cfe7c..3350688 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.NodeCreationListener.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.NodeCreationListener.html
@@ -95,7 +95,7 @@
<span class="sourceLineNo">087</span> throws Exception {<a name="line.87"></a>
<span class="sourceLineNo">088</span> ZKWatcher zk = new ZKWatcher(TEST_UTIL.getConfiguration(),<a name="line.88"></a>
<span class="sourceLineNo">089</span> name.getMethodName(), null);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> ZKUtil.createAndFailSilent(zk, zk.znodePaths.baseZNode);<a name="line.90"></a>
+<span class="sourceLineNo">090</span> ZKUtil.createAndFailSilent(zk, zk.getZNodePaths().baseZNode);<a name="line.90"></a>
<span class="sourceLineNo">091</span><a name="line.91"></a>
<span class="sourceLineNo">092</span> // Should not have a master yet<a name="line.92"></a>
<span class="sourceLineNo">093</span> MasterAddressTracker addressTracker = new MasterAddressTracker(zk, null);<a name="line.93"></a>
@@ -104,98 +104,100 @@
<span class="sourceLineNo">096</span> zk.registerListener(addressTracker);<a name="line.96"></a>
<span class="sourceLineNo">097</span><a name="line.97"></a>
<span class="sourceLineNo">098</span> // Use a listener to capture when the node is actually created<a name="line.98"></a>
-<span class="sourceLineNo">099</span> NodeCreationListener listener = new NodeCreationListener(zk, zk.znodePaths.masterAddressZNode);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> zk.registerListener(listener);<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (sn != null) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> LOG.info("Creating master node");<a name="line.103"></a>
-<span class="sourceLineNo">104</span> MasterAddressTracker.setMasterAddress(zk, zk.znodePaths.masterAddressZNode, sn, infoPort);<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> // Wait for the node to be created<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.info("Waiting for master address manager to be notified");<a name="line.107"></a>
-<span class="sourceLineNo">108</span> listener.waitForCreation();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> LOG.info("Master node created");<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return addressTracker;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<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> * Unit tests that uses ZooKeeper but does not use the master-side methods<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * but rather acts directly on ZK.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @throws Exception<a name="line.117"></a>
-<span class="sourceLineNo">118</span> */<a name="line.118"></a>
-<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
-<span class="sourceLineNo">120</span> public void testMasterAddressTrackerFromZK() throws Exception {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> // Create the master node with a dummy address<a name="line.121"></a>
-<span class="sourceLineNo">122</span> final int infoPort = 1235;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.123"></a>
-<span class="sourceLineNo">124</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, infoPort);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> try {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> assertTrue(addressTracker.hasMaster());<a name="line.126"></a>
-<span class="sourceLineNo">127</span> ServerName pulledAddress = addressTracker.getMasterAddress();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> assertTrue(pulledAddress.equals(sn));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertEquals(infoPort, addressTracker.getMasterInfoPort());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> } finally {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertTrue("Couldn't clean up master",<a name="line.131"></a>
-<span class="sourceLineNo">132</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public void testParsingNull() throws Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> assertNull("parse on null data should return null.", MasterAddressTracker.parse(null));<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> @Test<a name="line.142"></a>
-<span class="sourceLineNo">143</span> public void testNoBackups() throws Exception {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.144"></a>
-<span class="sourceLineNo">145</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, 1772);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> assertEquals("Should receive 0 for backup not found.", 0,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> addressTracker.getBackupMasterInfoPort(<a name="line.148"></a>
-<span class="sourceLineNo">149</span> ServerName.valueOf("doesnotexist.example.com", 1234, System.currentTimeMillis())));<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } finally {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertTrue("Couldn't clean up master",<a name="line.151"></a>
-<span class="sourceLineNo">152</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<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> @Test<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public void testNoMaster() throws Exception {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> final MasterAddressTracker addressTracker = setupMasterTracker(null, 1772);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> assertFalse(addressTracker.hasMaster());<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertNull("should get null master when none active.", addressTracker.getMasterAddress());<a name="line.160"></a>
-<span class="sourceLineNo">161</span> assertEquals("Should receive 0 for backup not found.", 0, addressTracker.getMasterInfoPort());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> public static class NodeCreationListener extends ZKListener {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> private static final Logger LOG = LoggerFactory.getLogger(NodeCreationListener.class);<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> private Semaphore lock;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> private String node;<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> public NodeCreationListener(ZKWatcher watcher, String node) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> super(watcher);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> lock = new Semaphore(0);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> this.node = node;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public void nodeCreated(String path) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if(path.equals(node)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.debug("nodeCreated(" + path + ")");<a name="line.179"></a>
-<span class="sourceLineNo">180</span> lock.release();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> public void waitForCreation() throws InterruptedException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> lock.acquire();<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span>}<a name="line.189"></a>
+<span class="sourceLineNo">099</span> NodeCreationListener listener = new NodeCreationListener(zk,<a name="line.99"></a>
+<span class="sourceLineNo">100</span> zk.getZNodePaths().masterAddressZNode);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> zk.registerListener(listener);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (sn != null) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> LOG.info("Creating master node");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> MasterAddressTracker.setMasterAddress(zk, zk.getZNodePaths().masterAddressZNode,<a name="line.105"></a>
+<span class="sourceLineNo">106</span> sn, infoPort);<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> // Wait for the node to be created<a name="line.108"></a>
+<span class="sourceLineNo">109</span> LOG.info("Waiting for master address manager to be notified");<a name="line.109"></a>
+<span class="sourceLineNo">110</span> listener.waitForCreation();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> LOG.info("Master node created");<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> return addressTracker;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> /**<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * Unit tests that uses ZooKeeper but does not use the master-side methods<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * but rather acts directly on ZK.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @throws Exception<a name="line.119"></a>
+<span class="sourceLineNo">120</span> */<a name="line.120"></a>
+<span class="sourceLineNo">121</span> @Test<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public void testMasterAddressTrackerFromZK() throws Exception {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // Create the master node with a dummy address<a name="line.123"></a>
+<span class="sourceLineNo">124</span> final int infoPort = 1235;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, infoPort);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> try {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertTrue(addressTracker.hasMaster());<a name="line.128"></a>
+<span class="sourceLineNo">129</span> ServerName pulledAddress = addressTracker.getMasterAddress();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> assertTrue(pulledAddress.equals(sn));<a name="line.130"></a>
+<span class="sourceLineNo">131</span> assertEquals(infoPort, addressTracker.getMasterInfoPort());<a name="line.131"></a>
+<span class="sourceLineNo">132</span> } finally {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> assertTrue("Couldn't clean up master",<a name="line.133"></a>
+<span class="sourceLineNo">134</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<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><a name="line.138"></a>
+<span class="sourceLineNo">139</span> @Test<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public void testParsingNull() throws Exception {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> assertNull("parse on null data should return null.", MasterAddressTracker.parse(null));<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> @Test<a name="line.144"></a>
+<span class="sourceLineNo">145</span> public void testNoBackups() throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, 1772);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assertEquals("Should receive 0 for backup not found.", 0,<a name="line.149"></a>
+<span class="sourceLineNo">150</span> addressTracker.getBackupMasterInfoPort(<a name="line.150"></a>
+<span class="sourceLineNo">151</span> ServerName.valueOf("doesnotexist.example.com", 1234, System.currentTimeMillis())));<a name="line.151"></a>
+<span class="sourceLineNo">152</span> } finally {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> assertTrue("Couldn't clean up master",<a name="line.153"></a>
+<span class="sourceLineNo">154</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<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><a name="line.157"></a>
+<span class="sourceLineNo">158</span> @Test<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public void testNoMaster() throws Exception {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> final MasterAddressTracker addressTracker = setupMasterTracker(null, 1772);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> assertFalse(addressTracker.hasMaster());<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertNull("should get null master when none active.", addressTracker.getMasterAddress());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> assertEquals("Should receive 0 for backup not found.", 0, addressTracker.getMasterInfoPort());<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> public static class NodeCreationListener extends ZKListener {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> private static final Logger LOG = LoggerFactory.getLogger(NodeCreationListener.class);<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> private Semaphore lock;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> private String node;<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> public NodeCreationListener(ZKWatcher watcher, String node) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> super(watcher);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> lock = new Semaphore(0);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> this.node = node;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void nodeCreated(String path) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if(path.equals(node)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> LOG.debug("nodeCreated(" + path + ")");<a name="line.181"></a>
+<span class="sourceLineNo">182</span> lock.release();<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><a name="line.185"></a>
+<span class="sourceLineNo">186</span> public void waitForCreation() throws InterruptedException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> lock.acquire();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<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><a name="line.192"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.html
index b7cfe7c..3350688 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.html
@@ -95,7 +95,7 @@
<span class="sourceLineNo">087</span> throws Exception {<a name="line.87"></a>
<span class="sourceLineNo">088</span> ZKWatcher zk = new ZKWatcher(TEST_UTIL.getConfiguration(),<a name="line.88"></a>
<span class="sourceLineNo">089</span> name.getMethodName(), null);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> ZKUtil.createAndFailSilent(zk, zk.znodePaths.baseZNode);<a name="line.90"></a>
+<span class="sourceLineNo">090</span> ZKUtil.createAndFailSilent(zk, zk.getZNodePaths().baseZNode);<a name="line.90"></a>
<span class="sourceLineNo">091</span><a name="line.91"></a>
<span class="sourceLineNo">092</span> // Should not have a master yet<a name="line.92"></a>
<span class="sourceLineNo">093</span> MasterAddressTracker addressTracker = new MasterAddressTracker(zk, null);<a name="line.93"></a>
@@ -104,98 +104,100 @@
<span class="sourceLineNo">096</span> zk.registerListener(addressTracker);<a name="line.96"></a>
<span class="sourceLineNo">097</span><a name="line.97"></a>
<span class="sourceLineNo">098</span> // Use a listener to capture when the node is actually created<a name="line.98"></a>
-<span class="sourceLineNo">099</span> NodeCreationListener listener = new NodeCreationListener(zk, zk.znodePaths.masterAddressZNode);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> zk.registerListener(listener);<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (sn != null) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> LOG.info("Creating master node");<a name="line.103"></a>
-<span class="sourceLineNo">104</span> MasterAddressTracker.setMasterAddress(zk, zk.znodePaths.masterAddressZNode, sn, infoPort);<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> // Wait for the node to be created<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.info("Waiting for master address manager to be notified");<a name="line.107"></a>
-<span class="sourceLineNo">108</span> listener.waitForCreation();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> LOG.info("Master node created");<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return addressTracker;<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<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> * Unit tests that uses ZooKeeper but does not use the master-side methods<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * but rather acts directly on ZK.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @throws Exception<a name="line.117"></a>
-<span class="sourceLineNo">118</span> */<a name="line.118"></a>
-<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
-<span class="sourceLineNo">120</span> public void testMasterAddressTrackerFromZK() throws Exception {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> // Create the master node with a dummy address<a name="line.121"></a>
-<span class="sourceLineNo">122</span> final int infoPort = 1235;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.123"></a>
-<span class="sourceLineNo">124</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, infoPort);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> try {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> assertTrue(addressTracker.hasMaster());<a name="line.126"></a>
-<span class="sourceLineNo">127</span> ServerName pulledAddress = addressTracker.getMasterAddress();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> assertTrue(pulledAddress.equals(sn));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertEquals(infoPort, addressTracker.getMasterInfoPort());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> } finally {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertTrue("Couldn't clean up master",<a name="line.131"></a>
-<span class="sourceLineNo">132</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public void testParsingNull() throws Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> assertNull("parse on null data should return null.", MasterAddressTracker.parse(null));<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> @Test<a name="line.142"></a>
-<span class="sourceLineNo">143</span> public void testNoBackups() throws Exception {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.144"></a>
-<span class="sourceLineNo">145</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, 1772);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> assertEquals("Should receive 0 for backup not found.", 0,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> addressTracker.getBackupMasterInfoPort(<a name="line.148"></a>
-<span class="sourceLineNo">149</span> ServerName.valueOf("doesnotexist.example.com", 1234, System.currentTimeMillis())));<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } finally {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertTrue("Couldn't clean up master",<a name="line.151"></a>
-<span class="sourceLineNo">152</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<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> @Test<a name="line.156"></a>
-<span class="sourceLineNo">157</span> public void testNoMaster() throws Exception {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> final MasterAddressTracker addressTracker = setupMasterTracker(null, 1772);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> assertFalse(addressTracker.hasMaster());<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertNull("should get null master when none active.", addressTracker.getMasterAddress());<a name="line.160"></a>
-<span class="sourceLineNo">161</span> assertEquals("Should receive 0 for backup not found.", 0, addressTracker.getMasterInfoPort());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> public static class NodeCreationListener extends ZKListener {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> private static final Logger LOG = LoggerFactory.getLogger(NodeCreationListener.class);<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> private Semaphore lock;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> private String node;<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> public NodeCreationListener(ZKWatcher watcher, String node) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> super(watcher);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> lock = new Semaphore(0);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> this.node = node;<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> @Override<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public void nodeCreated(String path) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if(path.equals(node)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.debug("nodeCreated(" + path + ")");<a name="line.179"></a>
-<span class="sourceLineNo">180</span> lock.release();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> public void waitForCreation() throws InterruptedException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> lock.acquire();<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span>}<a name="line.189"></a>
+<span class="sourceLineNo">099</span> NodeCreationListener listener = new NodeCreationListener(zk,<a name="line.99"></a>
+<span class="sourceLineNo">100</span> zk.getZNodePaths().masterAddressZNode);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> zk.registerListener(listener);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (sn != null) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> LOG.info("Creating master node");<a name="line.104"></a>
+<span class="sourceLineNo">105</span> MasterAddressTracker.setMasterAddress(zk, zk.getZNodePaths().masterAddressZNode,<a name="line.105"></a>
+<span class="sourceLineNo">106</span> sn, infoPort);<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span> // Wait for the node to be created<a name="line.108"></a>
+<span class="sourceLineNo">109</span> LOG.info("Waiting for master address manager to be notified");<a name="line.109"></a>
+<span class="sourceLineNo">110</span> listener.waitForCreation();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> LOG.info("Master node created");<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> return addressTracker;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> /**<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * Unit tests that uses ZooKeeper but does not use the master-side methods<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * but rather acts directly on ZK.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @throws Exception<a name="line.119"></a>
+<span class="sourceLineNo">120</span> */<a name="line.120"></a>
+<span class="sourceLineNo">121</span> @Test<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public void testMasterAddressTrackerFromZK() throws Exception {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // Create the master node with a dummy address<a name="line.123"></a>
+<span class="sourceLineNo">124</span> final int infoPort = 1235;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, infoPort);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> try {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertTrue(addressTracker.hasMaster());<a name="line.128"></a>
+<span class="sourceLineNo">129</span> ServerName pulledAddress = addressTracker.getMasterAddress();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> assertTrue(pulledAddress.equals(sn));<a name="line.130"></a>
+<span class="sourceLineNo">131</span> assertEquals(infoPort, addressTracker.getMasterInfoPort());<a name="line.131"></a>
+<span class="sourceLineNo">132</span> } finally {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> assertTrue("Couldn't clean up master",<a name="line.133"></a>
+<span class="sourceLineNo">134</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<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><a name="line.138"></a>
+<span class="sourceLineNo">139</span> @Test<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public void testParsingNull() throws Exception {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> assertNull("parse on null data should return null.", MasterAddressTracker.parse(null));<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> @Test<a name="line.144"></a>
+<span class="sourceLineNo">145</span> public void testNoBackups() throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> final ServerName sn = ServerName.valueOf("localhost", 1234, System.currentTimeMillis());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> final MasterAddressTracker addressTracker = setupMasterTracker(sn, 1772);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assertEquals("Should receive 0 for backup not found.", 0,<a name="line.149"></a>
+<span class="sourceLineNo">150</span> addressTracker.getBackupMasterInfoPort(<a name="line.150"></a>
+<span class="sourceLineNo">151</span> ServerName.valueOf("doesnotexist.example.com", 1234, System.currentTimeMillis())));<a name="line.151"></a>
+<span class="sourceLineNo">152</span> } finally {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> assertTrue("Couldn't clean up master",<a name="line.153"></a>
+<span class="sourceLineNo">154</span> MasterAddressTracker.deleteIfEquals(addressTracker.getWatcher(), sn.toString()));<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><a name="line.157"></a>
+<span class="sourceLineNo">158</span> @Test<a name="line.158"></a>
+<span class="sourceLineNo">159</span> public void testNoMaster() throws Exception {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> final MasterAddressTracker addressTracker = setupMasterTracker(null, 1772);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> assertFalse(addressTracker.hasMaster());<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertNull("should get null master when none active.", addressTracker.getMasterAddress());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> assertEquals("Should receive 0 for backup not found.", 0, addressTracker.getMasterInfoPort());<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> public static class NodeCreationListener extends ZKListener {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> private static final Logger LOG = LoggerFactory.getLogger(NodeCreationListener.class);<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> private Semaphore lock;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> private String node;<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> public NodeCreationListener(ZKWatcher watcher, String node) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> super(watcher);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> lock = new Semaphore(0);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> this.node = node;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void nodeCreated(String path) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if(path.equals(node)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> LOG.debug("nodeCreated(" + path + ")");<a name="line.181"></a>
+<span class="sourceLineNo">182</span> lock.release();<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><a name="line.185"></a>
+<span class="sourceLineNo">186</span> public void waitForCreation() throws InterruptedException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> lock.acquire();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<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><a name="line.192"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3797f0e6/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
index efad1b4..3dc4e42 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
@@ -114,7 +114,7 @@
<span class="sourceLineNo">106</span> TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.106"></a>
<span class="sourceLineNo">107</span> try {<a name="line.107"></a>
<span class="sourceLineNo">108</span> ZKWatcher zkw = TEST_UTIL.getZooKeeperWatcher();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> List<String> servers = ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode);<a name="line.109"></a>
+<span class="sourceLineNo">109</span> List<String> servers = ZKUtil.listChildrenNoWatch(zkw, zkw.getZNodePaths().rsZNode);<a name="line.109"></a>
<span class="sourceLineNo">110</span> // there would be NUM_RS+1 children - one for the master<a name="line.110"></a>
<span class="sourceLineNo">111</span> assertTrue(servers.size() ==<a name="line.111"></a>
<span class="sourceLineNo">112</span> NUM_RS + (LoadBalancer.isTablesOnMaster(TEST_UTIL.getConfiguration())? 1: 0));<a name="line.112"></a>
@@ -175,7 +175,7 @@
<span class="sourceLineNo">167</span> boolean tablesOnMaster = LoadBalancer.isTablesOnMaster(TEST_UTIL.getConfiguration());<a name="line.167"></a>
<span class="sourceLineNo">168</span> int expectedRS = NUM_RS + (tablesOnMaster? 1: 0);<a name="line.168"></a>
<span class="sourceLineNo">169</span> try (ZKWatcher zkw = TEST_UTIL.getZooKeeperWatcher()) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> List<String> servers = ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode);<a name="line.170"></a>
+<span class="sourceLineNo">170</span> List<String> servers = ZKUtil.listChildrenNoWatch(zkw, zkw.getZNodePaths().rsZNode);<a name="line.170"></a>
<span class="sourceLineNo">171</span> assertEquals(expectedRS, servers.size());<a name="line.171"></a>
<span class="sourceLineNo">172</span> }<a name="line.172"></a>
<span class="sourceLineNo">173</span> }<a name="line.173"></a>