http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFlushFromClient.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFlushFromClient.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFlushFromClient.html
index af4f61a..1d9d491 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFlushFromClient.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestFlushFromClient.html
@@ -33,160 +33,161 @@
 <span class="sourceLineNo">025</span>import java.util.List;<a 
name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.util.concurrent.TimeUnit;<a 
name="line.26"></a>
 <span class="sourceLineNo">027</span>import java.util.stream.Collectors;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.commons.logging.LogFactory;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.io.IOUtils;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.After;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.AfterClass;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.Before;<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.ClassRule;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.Rule;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.Test;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.junit.experimental.categories.Category;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.rules.TestName;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Category({MediumTests.class, 
ClientTests.class})<a name="line.50"></a>
-<span class="sourceLineNo">051</span>public class TestFlushFromClient {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @ClassRule<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      
HBaseClassTestRule.forClass(TestFlushFromClient.class);<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private static final Log LOG = 
LogFactory.getLog(TestFlushFromClient.class);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static AsyncConnection 
asyncConn;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static final byte[][] SPLITS = 
new byte[][]{Bytes.toBytes("3"), Bytes.toBytes("7")};<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  private static final List&lt;byte[]&gt; 
ROWS = Arrays.asList(<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    Bytes.toBytes("1"),<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>    Bytes.toBytes("4"),<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    Bytes.toBytes("8"));<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>  private static final byte[] FAMILY = 
Bytes.toBytes("f1");<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  @Rule<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  public TestName name = new 
TestName();<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public TableName tableName;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  @BeforeClass<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    
TEST_UTIL.startMiniCluster(ROWS.size());<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    asyncConn = 
ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>  }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  @AfterClass<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    IOUtils.cleanup(null, asyncConn);<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>    TEST_UTIL.shutdownMiniCluster();<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>  @Before<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public void setUp() throws Exception 
{<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    tableName = 
TableName.valueOf(name.getMethodName());<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    try (Table t = 
TEST_UTIL.createTable(tableName, FAMILY, SPLITS)) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      List&lt;Put&gt; puts = 
ROWS.stream().map(r -&gt; new Put(r)).collect(Collectors.toList());<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>      for (int i = 0; i != 20; ++i) {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>        byte[] value = 
Bytes.toBytes(i);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        puts.forEach(p -&gt; 
p.addColumn(FAMILY, value, value));<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      t.put(puts);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    
assertFalse(getRegionInfo().isEmpty());<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    
assertTrue(getRegionInfo().stream().allMatch(r -&gt; r.getMemStoreDataSize() != 
0));<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  @After<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  public void tearDown() throws Exception 
{<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    for (TableDescriptor htd : 
TEST_UTIL.getAdmin().listTableDescriptors()) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      LOG.info("Tear down, remove table=" 
+ htd.getTableName());<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      
TEST_UTIL.deleteTable(htd.getTableName());<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>
-<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  public void testFlushTable() throws 
Exception {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    try (Admin admin = 
TEST_UTIL.getAdmin()) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      admin.flush(tableName);<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>      
assertFalse(getRegionInfo().stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<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>  @Test<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public void testAsyncFlushTable() 
throws Exception {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    AsyncAdmin admin = 
asyncConn.getAdmin();<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    admin.flush(tableName).get();<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
assertFalse(getRegionInfo().stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<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>  @Test<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  public void testFlushRegion() throws 
Exception {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    try (Admin admin = 
TEST_UTIL.getAdmin()) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      for (HRegion r : getRegionInfo()) 
{<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        
admin.flushRegion(r.getRegionInfo().getRegionName());<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        TimeUnit.SECONDS.sleep(1);<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>        assertEquals(0, 
r.getMemStoreDataSize());<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
-<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>  @Test<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public void testAsyncFlushRegion() 
throws Exception {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    AsyncAdmin admin = 
asyncConn.getAdmin();<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    for (HRegion r : getRegionInfo()) {<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      
admin.flushRegion(r.getRegionInfo().getRegionName()).get();<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      TimeUnit.SECONDS.sleep(1);<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      assertEquals(0, 
r.getMemStoreDataSize());<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><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  @Test<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public void testFlushRegionServer() 
throws Exception {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    try (Admin admin = 
TEST_UTIL.getAdmin()) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      for (HRegionServer rs : 
TEST_UTIL.getHBaseCluster()<a name="line.146"></a>
-<span class="sourceLineNo">147</span>            
.getLiveRegionServerThreads()<a name="line.147"></a>
-<span class="sourceLineNo">148</span>            
.stream().map(JVMClusterUtil.RegionServerThread::getRegionServer)<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>            
.collect(Collectors.toList())) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>        
admin.flushRegionServer(rs.getServerName());<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        
assertFalse(getRegionInfo(rs).stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      }<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 
testAsyncFlushRegionServer() throws Exception {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    AsyncAdmin admin = 
asyncConn.getAdmin();<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    for (HRegionServer rs : 
TEST_UTIL.getHBaseCluster()<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      .getLiveRegionServerThreads()<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      
.stream().map(JVMClusterUtil.RegionServerThread::getRegionServer)<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      .collect(Collectors.toList())) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>      
admin.flushRegionServer(rs.getServerName()).get();<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      
assertFalse(getRegionInfo(rs).stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private List&lt;HRegion&gt; 
getRegionInfo() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    return 
TEST_UTIL.getHBaseCluster().getLiveRegionServerThreads().stream()<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      
.map(JVMClusterUtil.RegionServerThread::getRegionServer)<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      .flatMap(r -&gt; 
r.getRegions().stream())<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      .filter(r -&gt; 
r.getTableDescriptor().getTableName().equals(tableName))<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      .collect(Collectors.toList());<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>  private List&lt;HRegion&gt; 
getRegionInfo(HRegionServer rs) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    return rs.getRegions().stream()<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>      .filter(v -&gt; 
v.getTableDescriptor().getTableName().equals(tableName))<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      .collect(Collectors.toList());<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>}<a name="line.181"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.io.IOUtils;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.After;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.junit.AfterClass;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.Before;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.BeforeClass;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.Rule;<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>import org.junit.rules.TestName;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category({MediumTests.class, 
ClientTests.class})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestFlushFromClient {<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @ClassRule<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      
HBaseClassTestRule.forClass(TestFlushFromClient.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestFlushFromClient.class);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private static AsyncConnection 
asyncConn;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static final byte[][] SPLITS = 
new byte[][]{Bytes.toBytes("3"), Bytes.toBytes("7")};<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  private static final List&lt;byte[]&gt; 
ROWS = Arrays.asList(<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    Bytes.toBytes("1"),<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>    Bytes.toBytes("4"),<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>    Bytes.toBytes("8"));<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>  private static final byte[] FAMILY = 
Bytes.toBytes("f1");<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  @Rule<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public TestName name = new 
TestName();<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public TableName tableName;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  @BeforeClass<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    
TEST_UTIL.startMiniCluster(ROWS.size());<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    asyncConn = 
ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();<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>  @AfterClass<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    IOUtils.cleanup(null, asyncConn);<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    TEST_UTIL.shutdownMiniCluster();<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>  @Before<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public void setUp() throws Exception 
{<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    tableName = 
TableName.valueOf(name.getMethodName());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    try (Table t = 
TEST_UTIL.createTable(tableName, FAMILY, SPLITS)) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      List&lt;Put&gt; puts = 
ROWS.stream().map(r -&gt; new Put(r)).collect(Collectors.toList());<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>      for (int i = 0; i != 20; ++i) {<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>        byte[] value = 
Bytes.toBytes(i);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        puts.forEach(p -&gt; 
p.addColumn(FAMILY, value, value));<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      t.put(puts);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    
assertFalse(getRegionInfo().isEmpty());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    
assertTrue(getRegionInfo().stream().allMatch(r -&gt; r.getMemStoreDataSize() != 
0));<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>  @After<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  public void tearDown() throws Exception 
{<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    for (TableDescriptor htd : 
TEST_UTIL.getAdmin().listTableDescriptors()) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      LOG.info("Tear down, remove table=" 
+ htd.getTableName());<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      
TEST_UTIL.deleteTable(htd.getTableName());<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>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @Test<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public void testFlushTable() throws 
Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    try (Admin admin = 
TEST_UTIL.getAdmin()) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      admin.flush(tableName);<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      
assertFalse(getRegionInfo().stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<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><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  @Test<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public void testAsyncFlushTable() 
throws Exception {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    AsyncAdmin admin = 
asyncConn.getAdmin();<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    admin.flush(tableName).get();<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    
assertFalse(getRegionInfo().stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<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 testFlushRegion() throws 
Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    try (Admin admin = 
TEST_UTIL.getAdmin()) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      for (HRegion r : getRegionInfo()) 
{<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        
admin.flushRegion(r.getRegionInfo().getRegionName());<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        TimeUnit.SECONDS.sleep(1);<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>        assertEquals(0, 
r.getMemStoreDataSize());<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      }<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><a name="line.133"></a>
+<span class="sourceLineNo">134</span>  @Test<a name="line.134"></a>
+<span class="sourceLineNo">135</span>  public void testAsyncFlushRegion() 
throws Exception {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    AsyncAdmin admin = 
asyncConn.getAdmin();<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    for (HRegion r : getRegionInfo()) {<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>      
admin.flushRegion(r.getRegionInfo().getRegionName()).get();<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>      TimeUnit.SECONDS.sleep(1);<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>      assertEquals(0, 
r.getMemStoreDataSize());<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<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 testFlushRegionServer() 
throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    try (Admin admin = 
TEST_UTIL.getAdmin()) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      for (HRegionServer rs : 
TEST_UTIL.getHBaseCluster()<a name="line.147"></a>
+<span class="sourceLineNo">148</span>            
.getLiveRegionServerThreads()<a name="line.148"></a>
+<span class="sourceLineNo">149</span>            
.stream().map(JVMClusterUtil.RegionServerThread::getRegionServer)<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>            
.collect(Collectors.toList())) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>        
admin.flushRegionServer(rs.getServerName());<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        
assertFalse(getRegionInfo(rs).stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<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><a name="line.156"></a>
+<span class="sourceLineNo">157</span>  @Test<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  public void 
testAsyncFlushRegionServer() throws Exception {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    AsyncAdmin admin = 
asyncConn.getAdmin();<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    for (HRegionServer rs : 
TEST_UTIL.getHBaseCluster()<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      .getLiveRegionServerThreads()<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      
.stream().map(JVMClusterUtil.RegionServerThread::getRegionServer)<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      .collect(Collectors.toList())) {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      
admin.flushRegionServer(rs.getServerName()).get();<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      
assertFalse(getRegionInfo(rs).stream().anyMatch(r -&gt; r.getMemStoreDataSize() 
!= 0));<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private List&lt;HRegion&gt; 
getRegionInfo() {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    return 
TEST_UTIL.getHBaseCluster().getLiveRegionServerThreads().stream()<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>      
.map(JVMClusterUtil.RegionServerThread::getRegionServer)<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      .flatMap(r -&gt; 
r.getRegions().stream())<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      .filter(r -&gt; 
r.getTableDescriptor().getTableName().equals(tableName))<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      .collect(Collectors.toList());<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>  private List&lt;HRegion&gt; 
getRegionInfo(HRegionServer rs) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    return rs.getRegions().stream()<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      .filter(v -&gt; 
v.getTableDescriptor().getTableName().equals(tableName))<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      .collect(Collectors.toList());<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestSeparateClientZKCluster.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestSeparateClientZKCluster.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestSeparateClientZKCluster.html
index bcaa960..2993620 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestSeparateClientZKCluster.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestSeparateClientZKCluster.html
@@ -28,257 +28,258 @@
 <span class="sourceLineNo">020</span>import java.io.File;<a name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
 <span class="sourceLineNo">022</span>import org.apache.commons.io.FileUtils;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.commons.logging.LogFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.master.HMaster;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.master.NoSuchProcedureException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.AfterClass;<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.Assert;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.BeforeClass;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.ClassRule;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.Rule;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.Test;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.junit.experimental.categories.Category;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.rules.TestName;<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category(MediumTests.class)<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestSeparateClientZKCluster 
{<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  private static final Log LOG = 
LogFactory.getLog(TestSeparateClientZKCluster.class);<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>  private static final File clientZkDir = 
new File("/tmp/TestSeparateClientZKCluster");<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final int 
ZK_SESSION_TIMEOUT = 5000;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  private static MiniZooKeeperCluster 
clientZkCluster;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  private final byte[] family = 
Bytes.toBytes("cf");<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  private final byte[] qualifier = 
Bytes.toBytes("c1");<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private final byte[] row = 
Bytes.toBytes("row");<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private final byte[] value = 
Bytes.toBytes("v1");<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private final byte[] newVal = 
Bytes.toBytes("v2");<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  @Rule<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  public TestName name = new 
TestName();<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @ClassRule<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      
HBaseClassTestRule.forClass(TestSeparateClientZKCluster.class);<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  @BeforeClass<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public static void beforeAllTests() 
throws Exception {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    int clientZkPort = 21828;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    clientZkCluster = new 
MiniZooKeeperCluster(TEST_UTIL.getConfiguration());<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    
clientZkCluster.setDefaultClientPort(clientZkPort);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    
clientZkCluster.startup(clientZkDir);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    // reduce the retry number and start 
log counter<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
2);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    
TEST_UTIL.getConfiguration().setInt("hbase.client.start.log.errors.counter", 
-1);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    
TEST_UTIL.getConfiguration().setInt("zookeeper.recovery.retry", 1);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    // core settings for testing client 
ZK cluster<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    
TEST_UTIL.getConfiguration().set(HConstants.CLIENT_ZOOKEEPER_QUORUM, 
HConstants.LOCALHOST);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    
TEST_UTIL.getConfiguration().setInt(HConstants.CLIENT_ZOOKEEPER_CLIENT_PORT, 
clientZkPort);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    // reduce zk session timeout to 
easier trigger session expiration<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    
TEST_UTIL.getConfiguration().setInt(HConstants.ZK_SESSION_TIMEOUT, 
ZK_SESSION_TIMEOUT);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    // Start a cluster with 2 masters and 
3 regionservers.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    TEST_UTIL.startMiniCluster(2, 3);<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>  @AfterClass<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public static void afterAllTests() 
throws Exception {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    clientZkCluster.shutdown();<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    
FileUtils.deleteDirectory(clientZkDir);<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>  @Test(timeout = 60000)<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>  public void testBasicOperation() throws 
Exception {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    // create table<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    Connection conn = 
TEST_UTIL.getConnection();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    Admin admin = conn.getAdmin();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    HTable table = (HTable) 
conn.getTable(tn);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    try {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      ColumnFamilyDescriptorBuilder 
cfDescBuilder =<a name="line.102"></a>
-<span class="sourceLineNo">103</span>          
ColumnFamilyDescriptorBuilder.newBuilder(family);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      TableDescriptorBuilder 
tableDescBuilder =<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      
admin.createTable(tableDescBuilder.build());<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      // test simple get and put<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>      Put put = new Put(row);<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      put.addColumn(family, qualifier, 
value);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      table.put(put);<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>      Get get = new Get(row);<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>      Result result = table.get(get);<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      Assert.assertArrayEquals(value, 
result.getValue(family, qualifier));<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    } finally {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      admin.close();<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      table.close();<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>  @Test(timeout = 60000)<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>  public void testMasterSwitch() throws 
Exception {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // get an admin instance and issue 
some request first<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    Connection conn = 
TEST_UTIL.getConnection();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    Admin admin = conn.getAdmin();<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    LOG.debug("Tables: " + 
admin.listTableDescriptors());<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    try {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      // switch active master<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      HMaster master = 
cluster.getMaster();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      master.stopMaster();<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>      while (!master.isShutDown()) {<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>        Thread.sleep(200);<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      while (cluster.getMaster() == null 
|| !cluster.getMaster().isInitialized()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        Thread.sleep(200);<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      // confirm client access still 
works<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      
Assert.assertTrue(admin.balance(false));<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    } finally {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      admin.close();<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><a name="line.144"></a>
-<span class="sourceLineNo">145</span>  @Test(timeout = 60000)<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>  public void testMetaRegionMove() throws 
Exception {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    // create table<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    Connection conn = 
TEST_UTIL.getConnection();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    Admin admin = conn.getAdmin();<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    HTable table = (HTable) 
conn.getTable(tn);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    try {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      ColumnFamilyDescriptorBuilder 
cfDescBuilder =<a name="line.154"></a>
-<span class="sourceLineNo">155</span>          
ColumnFamilyDescriptorBuilder.newBuilder(family);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      TableDescriptorBuilder 
tableDescBuilder =<a name="line.156"></a>
-<span class="sourceLineNo">157</span>          
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>      
admin.createTable(tableDescBuilder.build());<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      // issue some requests to cache the 
region location<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      Put put = new Put(row);<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      put.addColumn(family, qualifier, 
value);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      table.put(put);<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>      Get get = new Get(row);<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>      Result result = table.get(get);<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>      // move meta region and confirm 
client could detect<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      byte[] destServerName = null;<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>      for (RegionServerThread rst : 
cluster.getLiveRegionServerThreads()) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        ServerName name = 
rst.getRegionServer().getServerName();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        if 
(!name.equals(cluster.getServerHoldingMeta())) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>          destServerName = 
Bytes.toBytes(name.getServerName());<a name="line.170"></a>
-<span class="sourceLineNo">171</span>          break;<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>
-<span class="sourceLineNo">174</span>      
admin.move(RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes(), 
destServerName);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      LOG.debug("Finished moving 
meta");<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      // invalidate client cache<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      RegionInfo region =<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>          
table.getRegionLocator().getRegionLocation(row).getRegion();<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>      ServerName currentServer = 
cluster.getServerHoldingRegion(tn, region.getRegionName());<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>      for (RegionServerThread rst : 
cluster.getLiveRegionServerThreads()) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        ServerName name = 
rst.getRegionServer().getServerName();<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        if (!name.equals(currentServer)) 
{<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          destServerName = 
Bytes.toBytes(name.getServerName());<a name="line.183"></a>
-<span class="sourceLineNo">184</span>          break;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      }<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      
admin.move(region.getEncodedNameAsBytes(), destServerName);<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      LOG.debug("Finished moving user 
region");<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      put = new Put(row);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      put.addColumn(family, qualifier, 
newVal);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      table.put(put);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      result = table.get(get);<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      Assert.assertArrayEquals(newVal, 
result.getValue(family, qualifier));<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    } finally {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      admin.close();<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>      table.close();<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>  @Test(timeout = 120000)<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>  public void 
testMetaMoveDuringClientZkClusterRestart() throws Exception {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    // create table<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    ClusterConnection conn = 
(ClusterConnection) TEST_UTIL.getConnection();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    Admin admin = conn.getAdmin();<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>    HTable table = (HTable) 
conn.getTable(tn);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    try {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      ColumnFamilyDescriptorBuilder 
cfDescBuilder =<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          
ColumnFamilyDescriptorBuilder.newBuilder(family);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      TableDescriptorBuilder 
tableDescBuilder =<a name="line.211"></a>
-<span class="sourceLineNo">212</span>          
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      
admin.createTable(tableDescBuilder.build());<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      // put some data<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>      Put put = new Put(row);<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>      put.addColumn(family, qualifier, 
value);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      table.put(put);<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>      // invalid connection cache<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>      conn.clearRegionCache();<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>      // stop client zk cluster<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>      clientZkCluster.shutdown();<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>      // stop current meta server and 
confirm the server shutdown process<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      // is not affected by client ZK 
crash<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      int metaServerId = 
cluster.getServerWithMeta();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      HRegionServer metaServer = 
cluster.getRegionServer(metaServerId);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      metaServer.stop("Stop current RS 
holding meta region");<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      while (!metaServer.isShutDown()) 
{<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        Thread.sleep(200);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>      }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      // wait for meta region online<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>      try {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        
cluster.getMaster().getAssignmentManager()<a name="line.233"></a>
-<span class="sourceLineNo">234</span>          
.waitForAssignment(RegionInfoBuilder.FIRST_META_REGIONINFO);<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>      } catch (NoSuchProcedureException 
e) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        // we don't need to take any 
further action<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      }<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      // wait some long time to make sure 
we will retry sync data to client ZK until data set<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      Thread.sleep(10000);<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>      
clientZkCluster.startup(clientZkDir);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      // new request should pass<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>      Get get = new Get(row);<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>      Result result = table.get(get);<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      Assert.assertArrayEquals(value, 
result.getValue(family, qualifier));<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    } finally {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      admin.close();<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>      table.close();<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>  @Test(timeout = 60000)<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>  public void testAsyncTable() throws 
Exception {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    ColumnFamilyDescriptorBuilder 
cfDescBuilder = ColumnFamilyDescriptorBuilder.newBuilder(family);<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span>    TableDescriptorBuilder 
tableDescBuilder =<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>    try (AsyncConnection ASYNC_CONN =<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>        
ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get()) 
{<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      
ASYNC_CONN.getAdmin().createTable(tableDescBuilder.build()).get();<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>      AsyncTable&lt;?&gt; table = 
ASYNC_CONN.getTable(tn);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      // put some data<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>      Put put = new Put(row);<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>      put.addColumn(family, qualifier, 
value);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      table.put(put).get();<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      // get and verify<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>      Get get = new Get(row);<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>      Result result = 
table.get(get).get();<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      Assert.assertArrayEquals(value, 
result.getValue(family, qualifier));<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>}<a name="line.273"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.MiniHBaseCluster;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.master.HMaster;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.master.NoSuchProcedureException;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.AfterClass;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.Assert;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.BeforeClass;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.junit.ClassRule;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.Rule;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.Test;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.junit.experimental.categories.Category;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.rules.TestName;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>@Category(MediumTests.class)<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>public class TestSeparateClientZKCluster 
{<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestSeparateClientZKCluster.class);<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  private static final File clientZkDir = 
new File("/tmp/TestSeparateClientZKCluster");<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  private static final int 
ZK_SESSION_TIMEOUT = 5000;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  private static MiniZooKeeperCluster 
clientZkCluster;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private final byte[] family = 
Bytes.toBytes("cf");<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  private final byte[] qualifier = 
Bytes.toBytes("c1");<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private final byte[] row = 
Bytes.toBytes("row");<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  private final byte[] value = 
Bytes.toBytes("v1");<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private final byte[] newVal = 
Bytes.toBytes("v2");<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>  @Rule<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  public TestName name = new 
TestName();<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  @ClassRule<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      
HBaseClassTestRule.forClass(TestSeparateClientZKCluster.class);<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @BeforeClass<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public static void beforeAllTests() 
throws Exception {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    int clientZkPort = 21828;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    clientZkCluster = new 
MiniZooKeeperCluster(TEST_UTIL.getConfiguration());<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    
clientZkCluster.setDefaultClientPort(clientZkPort);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    
clientZkCluster.startup(clientZkDir);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    // reduce the retry number and start 
log counter<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
2);<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    
TEST_UTIL.getConfiguration().setInt("hbase.client.start.log.errors.counter", 
-1);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    
TEST_UTIL.getConfiguration().setInt("zookeeper.recovery.retry", 1);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    // core settings for testing client 
ZK cluster<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    
TEST_UTIL.getConfiguration().set(HConstants.CLIENT_ZOOKEEPER_QUORUM, 
HConstants.LOCALHOST);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    
TEST_UTIL.getConfiguration().setInt(HConstants.CLIENT_ZOOKEEPER_CLIENT_PORT, 
clientZkPort);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    // reduce zk session timeout to 
easier trigger session expiration<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    
TEST_UTIL.getConfiguration().setInt(HConstants.ZK_SESSION_TIMEOUT, 
ZK_SESSION_TIMEOUT);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    // Start a cluster with 2 masters and 
3 regionservers.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    TEST_UTIL.startMiniCluster(2, 3);<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>  @AfterClass<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  public static void afterAllTests() 
throws Exception {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    clientZkCluster.shutdown();<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    
FileUtils.deleteDirectory(clientZkDir);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>  @Test(timeout = 60000)<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>  public void testBasicOperation() throws 
Exception {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    // create table<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    Connection conn = 
TEST_UTIL.getConnection();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    Admin admin = conn.getAdmin();<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    HTable table = (HTable) 
conn.getTable(tn);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    try {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      ColumnFamilyDescriptorBuilder 
cfDescBuilder =<a name="line.103"></a>
+<span class="sourceLineNo">104</span>          
ColumnFamilyDescriptorBuilder.newBuilder(family);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      TableDescriptorBuilder 
tableDescBuilder =<a name="line.105"></a>
+<span class="sourceLineNo">106</span>          
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>      
admin.createTable(tableDescBuilder.build());<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      // test simple get and put<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>      Put put = new Put(row);<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>      put.addColumn(family, qualifier, 
value);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      table.put(put);<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      Get get = new Get(row);<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      Result result = table.get(get);<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      Assert.assertArrayEquals(value, 
result.getValue(family, qualifier));<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    } finally {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      admin.close();<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      table.close();<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<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>  @Test(timeout = 60000)<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>  public void testMasterSwitch() throws 
Exception {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    // get an admin instance and issue 
some request first<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    Connection conn = 
TEST_UTIL.getConnection();<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    Admin admin = conn.getAdmin();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    LOG.debug("Tables: " + 
admin.listTableDescriptors());<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      // switch active master<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>      HMaster master = 
cluster.getMaster();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      master.stopMaster();<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>      while (!master.isShutDown()) {<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>        Thread.sleep(200);<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      while (cluster.getMaster() == null 
|| !cluster.getMaster().isInitialized()) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        Thread.sleep(200);<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      // confirm client access still 
works<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      
Assert.assertTrue(admin.balance(false));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    } finally {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      admin.close();<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>  @Test(timeout = 60000)<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>  public void testMetaRegionMove() throws 
Exception {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    // create table<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    Connection conn = 
TEST_UTIL.getConnection();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    Admin admin = conn.getAdmin();<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>    HTable table = (HTable) 
conn.getTable(tn);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    try {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      ColumnFamilyDescriptorBuilder 
cfDescBuilder =<a name="line.155"></a>
+<span class="sourceLineNo">156</span>          
ColumnFamilyDescriptorBuilder.newBuilder(family);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      TableDescriptorBuilder 
tableDescBuilder =<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      
admin.createTable(tableDescBuilder.build());<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      // issue some requests to cache the 
region location<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      Put put = new Put(row);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      put.addColumn(family, qualifier, 
value);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      table.put(put);<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      Get get = new Get(row);<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>      Result result = table.get(get);<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>      // move meta region and confirm 
client could detect<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      byte[] destServerName = null;<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      for (RegionServerThread rst : 
cluster.getLiveRegionServerThreads()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        ServerName name = 
rst.getRegionServer().getServerName();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        if 
(!name.equals(cluster.getServerHoldingMeta())) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>          destServerName = 
Bytes.toBytes(name.getServerName());<a name="line.171"></a>
+<span class="sourceLineNo">172</span>          break;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      
admin.move(RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes(), 
destServerName);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      LOG.debug("Finished moving 
meta");<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      // invalidate client cache<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>      RegionInfo region =<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>          
table.getRegionLocator().getRegionLocation(row).getRegion();<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      ServerName currentServer = 
cluster.getServerHoldingRegion(tn, region.getRegionName());<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>      for (RegionServerThread rst : 
cluster.getLiveRegionServerThreads()) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        ServerName name = 
rst.getRegionServer().getServerName();<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        if (!name.equals(currentServer)) 
{<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          destServerName = 
Bytes.toBytes(name.getServerName());<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          break;<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>      
admin.move(region.getEncodedNameAsBytes(), destServerName);<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      LOG.debug("Finished moving user 
region");<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      put = new Put(row);<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      put.addColumn(family, qualifier, 
newVal);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      table.put(put);<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      result = table.get(get);<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      Assert.assertArrayEquals(newVal, 
result.getValue(family, qualifier));<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    } finally {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      admin.close();<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      table.close();<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>  @Test(timeout = 120000)<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>  public void 
testMetaMoveDuringClientZkClusterRestart() throws Exception {<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    // create table<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    ClusterConnection conn = 
(ClusterConnection) TEST_UTIL.getConnection();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    Admin admin = conn.getAdmin();<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    HTable table = (HTable) 
conn.getTable(tn);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    try {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      ColumnFamilyDescriptorBuilder 
cfDescBuilder =<a name="line.210"></a>
+<span class="sourceLineNo">211</span>          
ColumnFamilyDescriptorBuilder.newBuilder(family);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      TableDescriptorBuilder 
tableDescBuilder =<a name="line.212"></a>
+<span class="sourceLineNo">213</span>          
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>      
admin.createTable(tableDescBuilder.build());<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      // put some data<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>      Put put = new Put(row);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>      put.addColumn(family, qualifier, 
value);<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      table.put(put);<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>      // invalid connection cache<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      conn.clearRegionCache();<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>      // stop client zk cluster<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>      clientZkCluster.shutdown();<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>      // stop current meta server and 
confirm the server shutdown process<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      // is not affected by client ZK 
crash<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      MiniHBaseCluster cluster = 
TEST_UTIL.getHBaseCluster();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      int metaServerId = 
cluster.getServerWithMeta();<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      HRegionServer metaServer = 
cluster.getRegionServer(metaServerId);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      metaServer.stop("Stop current RS 
holding meta region");<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      while (!metaServer.isShutDown()) 
{<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        Thread.sleep(200);<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>      }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      // wait for meta region online<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>      try {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        
cluster.getMaster().getAssignmentManager()<a name="line.234"></a>
+<span class="sourceLineNo">235</span>          
.waitForAssignment(RegionInfoBuilder.FIRST_META_REGIONINFO);<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>      } catch (NoSuchProcedureException 
e) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span>        // we don't need to take any 
further action<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      // wait some long time to make sure 
we will retry sync data to client ZK until data set<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      Thread.sleep(10000);<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      
clientZkCluster.startup(clientZkDir);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      // new request should pass<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>      Get get = new Get(row);<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>      Result result = table.get(get);<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      Assert.assertArrayEquals(value, 
result.getValue(family, qualifier));<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    } finally {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      admin.close();<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>      table.close();<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>    }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>  @Test(timeout = 60000)<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>  public void testAsyncTable() throws 
Exception {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    TableName tn = 
TableName.valueOf(name.getMethodName());<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    ColumnFamilyDescriptorBuilder 
cfDescBuilder = ColumnFamilyDescriptorBuilder.newBuilder(family);<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    TableDescriptorBuilder 
tableDescBuilder =<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        
TableDescriptorBuilder.newBuilder(tn).setColumnFamily(cfDescBuilder.build());<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>    try (AsyncConnection ASYNC_CONN =<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>        
ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get()) 
{<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      
ASYNC_CONN.getAdmin().createTable(tableDescBuilder.build()).get();<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>      AsyncTable&lt;?&gt; table = 
ASYNC_CONN.getTable(tn);<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      // put some data<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>      Put put = new Put(row);<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>      put.addColumn(family, qualifier, 
value);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      table.put(put).get();<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>      // get and verify<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>      Get get = new Get(row);<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>      Result result = 
table.get(get).get();<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      LOG.debug("Result: " + 
Bytes.toString(result.getValue(family, qualifier)));<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      Assert.assertArrayEquals(value, 
result.getValue(family, qualifier));<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>}<a name="line.274"></a>
 
 
 

Reply via email to