http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
index 5a188ed..1047518 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
@@ -38,108 +38,114 @@
 <span class="sourceLineNo">030</span><a name="line.30"></a>
 <span class="sourceLineNo">031</span>import org.apache.commons.io.IOUtils;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HRegionLocation;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.RegionLocations;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.zookeeper.ReadOnlyZKClient;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.AfterClass;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.BeforeClass;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.junit.experimental.categories.Category;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category({ MediumTests.class, 
ClientTests.class })<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestZKAsyncRegistry {<a 
name="line.48"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.ClusterId;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.HRegionLocation;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.RegionLocations;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.zookeeper.ReadOnlyZKClient;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.AfterClass;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.BeforeClass;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.Test;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.junit.experimental.categories.Category;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.slf4j.Logger;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.LoggerFactory;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static ZKAsyncRegistry 
REGISTRY;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  // waits for all replicas to have 
region location<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  static void 
waitUntilAllReplicasHavingRegionLocation(TableName tbl) throws IOException {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    TEST_UTIL.waitFor(<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>      
TEST_UTIL.getConfiguration().getLong("hbase.client.sync.wait.timeout.msec", 
60000), 200, true,<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      new 
ExplainingPredicate&lt;IOException&gt;() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>        @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>        public String explainFailure() 
throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>          return 
TEST_UTIL.explainTableAvailability(tbl);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>        }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>        @Override<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        public boolean evaluate() throws 
IOException {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>          AtomicBoolean ready = new 
AtomicBoolean(true);<a name="line.66"></a>
-<span class="sourceLineNo">067</span>          try {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>            RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>            assertEquals(3, 
locs.getRegionLocations().length);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>            IntStream.range(0, 
3).forEach(i -&gt; {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>              HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>              if (loc == null) {<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>                ready.set(false);<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>              }<a name="line.74"></a>
-<span class="sourceLineNo">075</span>            });<a name="line.75"></a>
-<span class="sourceLineNo">076</span>          } catch (Exception e) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>            ready.set(false);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>          }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>          return ready.get();<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>        }<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      });<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  @BeforeClass<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static void setUp() throws 
Exception {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    
TEST_UTIL.getConfiguration().setInt(META_REPLICAS_NUM, 3);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    TEST_UTIL.startMiniCluster(3);<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    REGISTRY = new 
ZKAsyncRegistry(TEST_UTIL.getConfiguration());<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>  @AfterClass<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public static void tearDown() throws 
Exception {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    IOUtils.closeQuietly(REGISTRY);<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    TEST_UTIL.shutdownMiniCluster();<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>  @Test<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public void test() throws 
InterruptedException, ExecutionException, IOException {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getClusterStatus().getClusterId(),<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      REGISTRY.getClusterId().get());<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getClusterStatus().getServersSize(),<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>      
REGISTRY.getCurrentNrHRS().get().intValue());<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getMaster().getServerName(),<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>      
REGISTRY.getMasterAddress().get());<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    assertEquals(-1, 
REGISTRY.getMasterInfoPort().get().intValue());<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    
waitUntilAllReplicasHavingRegionLocation(TableName.META_TABLE_NAME);<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    assertEquals(3, 
locs.getRegionLocations().length);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    IntStream.range(0, 3).forEach(i -&gt; 
{<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      assertNotNull("Replica " + i + " 
doesn't have location", loc);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      
assertEquals(TableName.META_TABLE_NAME, loc.getRegion().getTable());<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      assertEquals(i, 
loc.getRegion().getReplicaId());<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>  @Test<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public void 
testIndependentZKConnections() throws IOException {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    ReadOnlyZKClient zk1 = 
REGISTRY.getZKClient();<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>    Configuration otherConf = new 
Configuration(TEST_UTIL.getConfiguration());<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    
otherConf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1");<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    try (ZKAsyncRegistry otherRegistry = 
new ZKAsyncRegistry(otherConf)) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      ReadOnlyZKClient zk2 = 
otherRegistry.getZKClient();<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>      assertNotSame("Using a different 
configuration / quorum should result in different backing " +<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>          "zk connection.",<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>        zk1, zk2);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      assertNotEquals(<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>        "Using a different configrution / 
quorum should be reflected in the " + "zk connection.",<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        zk1.getConnectString(), 
zk2.getConnectString());<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>}<a name="line.134"></a>
+<span class="sourceLineNo">050</span>@Category({ MediumTests.class, 
ClientTests.class })<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class TestZKAsyncRegistry {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKAsyncRegistry.class);<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  private static ZKAsyncRegistry 
REGISTRY;<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  // waits for all replicas to have 
region location<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  static void 
waitUntilAllReplicasHavingRegionLocation(TableName tbl) throws IOException {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>    TEST_UTIL.waitFor(<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      
TEST_UTIL.getConfiguration().getLong("hbase.client.sync.wait.timeout.msec", 
60000), 200, true,<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      new 
ExplainingPredicate&lt;IOException&gt;() {<a name="line.61"></a>
+<span class="sourceLineNo">062</span>        @Override<a name="line.62"></a>
+<span class="sourceLineNo">063</span>        public String explainFailure() 
throws IOException {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>          return 
TEST_UTIL.explainTableAvailability(tbl);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>        }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>        @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span>        public boolean evaluate() throws 
IOException {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>          AtomicBoolean ready = new 
AtomicBoolean(true);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>          try {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>            RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.71"></a>
+<span class="sourceLineNo">072</span>            assertEquals(3, 
locs.getRegionLocations().length);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>            IntStream.range(0, 
3).forEach(i -&gt; {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>              HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>              if (loc == null) {<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>                ready.set(false);<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>          } catch (Exception e) {<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>            ready.set(false);<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>          }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>          return ready.get();<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>        }<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>  @BeforeClass<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public static void setUp() throws 
Exception {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    
TEST_UTIL.getConfiguration().setInt(META_REPLICAS_NUM, 3);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    TEST_UTIL.startMiniCluster(3);<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    REGISTRY = new 
ZKAsyncRegistry(TEST_UTIL.getConfiguration());<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @AfterClass<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public static void tearDown() throws 
Exception {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    IOUtils.closeQuietly(REGISTRY);<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  public void test() throws 
InterruptedException, ExecutionException, IOException {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    LOG.info("STARTED TEST");<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    String clusterId = 
REGISTRY.getClusterId().get();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    String expectedClusterId = 
TEST_UTIL.getHBaseCluster().getMaster().getClusterId();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    assertEquals("Expected " + 
expectedClusterId + ", found=" + clusterId,<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        expectedClusterId, clusterId);<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getClusterStatus().getServersSize(),<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>      
REGISTRY.getCurrentNrHRS().get().intValue());<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getMaster().getServerName(),<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      
REGISTRY.getMasterAddress().get());<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    assertEquals(-1, 
REGISTRY.getMasterInfoPort().get().intValue());<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    
waitUntilAllReplicasHavingRegionLocation(TableName.META_TABLE_NAME);<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    assertEquals(3, 
locs.getRegionLocations().length);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    IntStream.range(0, 3).forEach(i -&gt; 
{<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      assertNotNull("Replica " + i + " 
doesn't have location", loc);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      
assertEquals(TableName.META_TABLE_NAME, loc.getRegion().getTable());<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>      assertEquals(i, 
loc.getRegion().getReplicaId());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    });<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  @Test<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public void 
testIndependentZKConnections() throws IOException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    ReadOnlyZKClient zk1 = 
REGISTRY.getZKClient();<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    Configuration otherConf = new 
Configuration(TEST_UTIL.getConfiguration());<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    
otherConf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1");<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    try (ZKAsyncRegistry otherRegistry = 
new ZKAsyncRegistry(otherConf)) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      ReadOnlyZKClient zk2 = 
otherRegistry.getZKClient();<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>      assertNotSame("Using a different 
configuration / quorum should result in different backing " +<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>          "zk connection.",<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>        zk1, zk2);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      assertNotEquals(<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>        "Using a different configrution / 
quorum should be reflected in the " + "zk connection.",<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        zk1.getConnectString(), 
zk2.getConnectString());<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>}<a name="line.140"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html
index 9f35ccb..1ec1570 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSAsyncFSWAL.html
@@ -27,16 +27,18 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.junit.experimental.categories.Category;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>@Category({ MasterTests.class, 
LargeTests.class })<a name="line.24"></a>
-<span class="sourceLineNo">025</span>public class TestDLSAsyncFSWAL extends 
AbstractTestDLS {<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>  @Override<a name="line.27"></a>
-<span class="sourceLineNo">028</span>  protected String getWalProvider() {<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>    return "asyncfs";<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>  }<a name="line.30"></a>
-<span class="sourceLineNo">031</span>}<a name="line.31"></a>
+<span class="sourceLineNo">022</span>import org.junit.Ignore;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.junit.experimental.categories.Category;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>@Ignore // Temporarily disabled. Fails 
40% of the time.<a name="line.25"></a>
+<span class="sourceLineNo">026</span>@Category({ MasterTests.class, 
LargeTests.class })<a name="line.26"></a>
+<span class="sourceLineNo">027</span>public class TestDLSAsyncFSWAL extends 
AbstractTestDLS {<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>  @Override<a name="line.29"></a>
+<span class="sourceLineNo">030</span>  protected String getWalProvider() {<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>    return "asyncfs";<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSFSHLog.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSFSHLog.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSFSHLog.html
index cf79e59..f19c6b2 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSFSHLog.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDLSFSHLog.html
@@ -27,16 +27,18 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.junit.experimental.categories.Category;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>@Category({ MasterTests.class, 
LargeTests.class })<a name="line.24"></a>
-<span class="sourceLineNo">025</span>public class TestDLSFSHLog extends 
AbstractTestDLS {<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>  @Override<a name="line.27"></a>
-<span class="sourceLineNo">028</span>  protected String getWalProvider() {<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>    return "filesystem";<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>  }<a name="line.30"></a>
-<span class="sourceLineNo">031</span>}<a name="line.31"></a>
+<span class="sourceLineNo">022</span>import org.junit.Ignore;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.junit.experimental.categories.Category;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>@Ignore // Fails 33% of the time. 
Disabling for now.<a name="line.25"></a>
+<span class="sourceLineNo">026</span>@Category({ MasterTests.class, 
LargeTests.class })<a name="line.26"></a>
+<span class="sourceLineNo">027</span>public class TestDLSFSHLog extends 
AbstractTestDLS {<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>  @Override<a name="line.29"></a>
+<span class="sourceLineNo">030</span>  protected String getWalProvider() {<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>    return "filesystem";<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestTableStateManager.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestTableStateManager.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestTableStateManager.html
index 8fbbfd4..e56321c 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestTableStateManager.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestTableStateManager.html
@@ -66,7 +66,7 @@
 <span class="sourceLineNo">058</span>  @Test(timeout = 60000)<a 
name="line.58"></a>
 <span class="sourceLineNo">059</span>  public void testUpgradeFromZk() throws 
Exception {<a name="line.59"></a>
 <span class="sourceLineNo">060</span>    final TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    TEST_UTIL.startMiniCluster(1, 1);<a 
name="line.61"></a>
+<span class="sourceLineNo">061</span>    TEST_UTIL.startMiniCluster(2, 1);<a 
name="line.61"></a>
 <span class="sourceLineNo">062</span>    
TEST_UTIL.shutdownMiniHBaseCluster();<a name="line.62"></a>
 <span class="sourceLineNo">063</span>    ZKWatcher watcher = 
TEST_UTIL.getZooKeeperWatcher();<a name="line.63"></a>
 <span class="sourceLineNo">064</span>    setTableStateInZK(watcher, tableName, 
ZooKeeperProtos.DeprecatedTableState.State.DISABLED);<a name="line.64"></a>

Reply via email to