http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a839f85f/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackup.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackup.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackup.html
index 1e67962..085ecd6 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackup.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackup.html
@@ -165,61 +165,63 @@
 <span class="sourceLineNo">157</span>    int NB_ROWS_FAM2 = 7;<a 
name="line.157"></a>
 <span class="sourceLineNo">158</span>    HTable t3 = insertIntoTable(conn, 
table1, fam2Name, 2, NB_ROWS_FAM2);<a name="line.158"></a>
 <span class="sourceLineNo">159</span>    t3.close();<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>    // #3 - incremental backup for 
multiple tables<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    request = 
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>    String backupIdIncMultiple2 = 
client.backupTables(request);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    
assertTrue(checkSucceeded(backupIdIncMultiple2));<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>    // #4 - restore full backup for all 
tables<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    TableName[] tablesRestoreFull = new 
TableName[] { table1, table2 };<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span>    TableName[] tablesMapFull = new 
TableName[] { table1_restore, table2_restore };<a name="line.169"></a>
+<span class="sourceLineNo">160</span>    // Wait for 5 sec to make sure that 
old WALs were deleted<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    Thread.sleep(5000);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>    // #3 - incremental backup for 
multiple tables<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    request = 
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>    String backupIdIncMultiple2 = 
client.backupTables(request);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    
assertTrue(checkSucceeded(backupIdIncMultiple2));<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>    // #4 - restore full backup for all 
tables<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    TableName[] tablesRestoreFull = new 
TableName[] { table1, table2 };<a name="line.169"></a>
 <span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>    LOG.debug("Restoring full " + 
backupIdFull);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdFull, 
false,<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      tablesRestoreFull, tablesMapFull, 
true));<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>    // #5.1 - check tables for full 
restore<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    HBaseAdmin hAdmin = 
TEST_UTIL.getHBaseAdmin();<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    
assertTrue(hAdmin.tableExists(table1_restore));<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    
assertTrue(hAdmin.tableExists(table2_restore));<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span>    hAdmin.close();<a name="line.180"></a>
+<span class="sourceLineNo">171</span>    TableName[] tablesMapFull = new 
TableName[] { table1_restore, table2_restore };<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>    LOG.debug("Restoring full " + 
backupIdFull);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdFull, 
false,<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      tablesRestoreFull, tablesMapFull, 
true));<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>    // #5.1 - check tables for full 
restore<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    HBaseAdmin hAdmin = 
TEST_UTIL.getHBaseAdmin();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    
assertTrue(hAdmin.tableExists(table1_restore));<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    
assertTrue(hAdmin.tableExists(table2_restore));<a name="line.180"></a>
 <span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>    // #5.2 - checking row count of 
tables for full restore<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    HTable hTable = (HTable) 
conn.getTable(table1_restore);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 
NB_ROWS_FAM3);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    hTable.close();<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>    hTable = (HTable) 
conn.getTable(table2_restore);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH);<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    hTable.close();<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>    // #6 - restore incremental backup 
for multiple tables, with overwrite<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    TableName[] tablesRestoreIncMultiple 
= new TableName[] { table1, table2 };<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    TableName[] tablesMapIncMultiple = 
new TableName[] { table1_restore, table2_restore };<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, 
backupIdIncMultiple2,<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      false, tablesRestoreIncMultiple, 
tablesMapIncMultiple, true));<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>    hTable = (HTable) 
conn.getTable(table1_restore);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    LOG.debug("After incremental restore: 
" + hTable.getDescriptor());<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    LOG.debug("f1 has " + 
TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 
ADD_ROWS);<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    LOG.debug("f2 has " + 
TEST_UTIL.countRows(hTable, fam2Name) + " rows");<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable, fam2Name), NB_ROWS_FAM2);<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    hTable.close();<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    hTable = (HTable) 
conn.getTable(table2_restore);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 5);<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>    hTable.close();<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>    admin.close();<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    conn.close();<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
+<span class="sourceLineNo">182</span>    hAdmin.close();<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // #5.2 - checking row count of 
tables for full restore<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    HTable hTable = (HTable) 
conn.getTable(table1_restore);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 
NB_ROWS_FAM3);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    hTable.close();<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>    hTable = (HTable) 
conn.getTable(table2_restore);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH);<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>    hTable.close();<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span>    // #6 - restore incremental backup 
for multiple tables, with overwrite<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    TableName[] tablesRestoreIncMultiple 
= new TableName[] { table1, table2 };<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    TableName[] tablesMapIncMultiple = 
new TableName[] { table1_restore, table2_restore };<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, 
backupIdIncMultiple2,<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      false, tablesRestoreIncMultiple, 
tablesMapIncMultiple, true));<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>    hTable = (HTable) 
conn.getTable(table1_restore);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    LOG.debug("After incremental restore: 
" + hTable.getDescriptor());<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    LOG.debug("f1 has " + 
TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 
ADD_ROWS);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    LOG.debug("f2 has " + 
TEST_UTIL.countRows(hTable, fam2Name) + " rows");<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable, fam2Name), NB_ROWS_FAM2);<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>    hTable.close();<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span>    hTable = (HTable) 
conn.getTable(table2_restore);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 5);<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>    hTable.close();<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>    admin.close();<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    conn.close();<a name="line.212"></a>
 <span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>}<a name="line.214"></a>
+<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>}<a name="line.216"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a839f85f/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestGetScanPartialResult.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestGetScanPartialResult.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestGetScanPartialResult.html
new file mode 100644
index 0000000..9f8a40c
--- /dev/null
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestGetScanPartialResult.html
@@ -0,0 +1,174 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a 
name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertEquals;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertTrue;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.io.IOException;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.junit.AfterClass;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.junit.BeforeClass;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.junit.ClassRule;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.junit.Test;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.junit.experimental.categories.Category;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Testcase for HBASE-21032, where use 
the wrong readType from a Scan instance which is actually a<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span> * get scan and cause returning only 1 
cell per rpc call.<a name="line.37"></a>
+<span class="sourceLineNo">038</span> */<a name="line.38"></a>
+<span class="sourceLineNo">039</span>@Category({ ClientTests.class, 
MediumTests.class })<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class TestGetScanPartialResult {<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  @ClassRule<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    
HBaseClassTestRule.forClass(TestGetScanPartialResult.class);<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  private static final TableName TABLE = 
TableName.valueOf("table");<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  private static final byte[] CF = { 'c', 
'f' };<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  private static final byte[] ROW = { 
'r', 'o', 'w' };<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  private static final int VALUE_SIZE = 
10000;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  private static final int NUM_COLUMNS = 
300;<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  @BeforeClass<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  public static void setUp() throws 
Exception {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    TEST_UTIL.startMiniCluster(1);<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>    TEST_UTIL.createTable(TABLE, CF);<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @AfterClass<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  public static void tearDown() throws 
Exception {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    TEST_UTIL.shutdownMiniCluster();<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>  private static byte[] 
makeLargeValue(int size) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    byte[] v = new byte[size];<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>    for (int i = 0; i &lt; size; i++) {<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>      v[i] = 0;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    }<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    return v;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  @Test<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public void test() throws IOException 
{<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    try (Table t = 
TEST_UTIL.getConnection().getTable(TABLE)) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      // populate a row with bunch of 
columns and large values<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      // to cause scan to return 
partials<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      byte[] val = 
makeLargeValue(VALUE_SIZE);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      Put p = new Put(ROW);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>      for (int i = 0; i &lt; NUM_COLUMNS; 
i++) {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        p.addColumn(CF, 
Integer.toString(i).getBytes(), val);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      t.put(p);<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>      Scan scan = new Scan();<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      scan.withStartRow(ROW);<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      scan.withStopRow(ROW, true);<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>      
scan.setAllowPartialResults(true);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      scan.setMaxResultSize(2L * 1024 * 
1024);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      scan.readVersions(1);<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>      ResultScanner scanner = 
t.getScanner(scan);<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>      int nResults = 0;<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      int nCells = 0;<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>      for (Result result = 
scanner.next(); (result != null); result = scanner.next()) {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>        nResults++;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        nCells += 
result.listCells().size();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      assertEquals(NUM_COLUMNS, 
nCells);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      assertTrue(nResults &lt; 5);<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>}<a name="line.102"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a839f85f/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.TruncateTableProcedureOnHDFSFailure.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.TruncateTableProcedureOnHDFSFailure.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.TruncateTableProcedureOnHDFSFailure.html
index 5c2583e..0af43c6 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.TruncateTableProcedureOnHDFSFailure.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.TruncateTableProcedureOnHDFSFailure.html
@@ -63,12 +63,12 @@
 <span class="sourceLineNo">055</span>import org.slf4j.LoggerFactory;<a 
name="line.55"></a>
 <span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;<a 
name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>@Category({MasterTests.class, 
MediumTests.class})<a name="line.58"></a>
+<span class="sourceLineNo">058</span>@Category({ MasterTests.class, 
MediumTests.class })<a name="line.58"></a>
 <span class="sourceLineNo">059</span>public class TestTruncateTableProcedure 
extends TestTableDDLProcedureBase {<a name="line.59"></a>
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>  @ClassRule<a name="line.61"></a>
 <span class="sourceLineNo">062</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      
HBaseClassTestRule.forClass(TestTruncateTableProcedure.class);<a 
name="line.63"></a>
+<span class="sourceLineNo">063</span>    
HBaseClassTestRule.forClass(TestTruncateTableProcedure.class);<a 
name="line.63"></a>
 <span class="sourceLineNo">064</span><a name="line.64"></a>
 <span class="sourceLineNo">065</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestTruncateTableProcedure.class);<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
@@ -324,7 +324,7 @@
 <span class="sourceLineNo">316</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a 
name="line.316"></a>
 <span class="sourceLineNo">317</span>  }<a name="line.317"></a>
 <span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>  @Test(timeout = 60000)<a 
name="line.319"></a>
+<span class="sourceLineNo">319</span>  @Test<a name="line.319"></a>
 <span class="sourceLineNo">320</span>  public void 
testTruncateWithPreserveAfterSplit() throws Exception {<a name="line.320"></a>
 <span class="sourceLineNo">321</span>    String[] families = new String[] { 
"f1", "f2" };<a name="line.321"></a>
 <span class="sourceLineNo">322</span>    byte[][] splitKeys =<a 
name="line.322"></a>
@@ -332,10 +332,10 @@
 <span class="sourceLineNo">324</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.324"></a>
 <span class="sourceLineNo">325</span>    RegionInfo[] regions = 
MasterProcedureTestingUtility.createTable(getMasterProcedureExecutor(),<a 
name="line.325"></a>
 <span class="sourceLineNo">326</span>      tableName, splitKeys, families);<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>    splitAndTruncate(tableName, 
regions);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    splitAndTruncate(tableName, regions, 
1);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>  }<a name="line.328"></a>
 <span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @Test(timeout = 60000)<a 
name="line.330"></a>
+<span class="sourceLineNo">330</span>  @Test<a name="line.330"></a>
 <span class="sourceLineNo">331</span>  public void 
testTruncatePreserveWithReplicaRegionAfterSplit() throws Exception {<a 
name="line.331"></a>
 <span class="sourceLineNo">332</span>    String[] families = new String[] { 
"f1", "f2" };<a name="line.332"></a>
 <span class="sourceLineNo">333</span>    byte[][] splitKeys =<a 
name="line.333"></a>
@@ -343,46 +343,45 @@
 <span class="sourceLineNo">335</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.335"></a>
 <span class="sourceLineNo">336</span><a name="line.336"></a>
 <span class="sourceLineNo">337</span>    // create a table with region 
replications<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    TableDescriptor htd = 
TableDescriptorBuilder.newBuilder(tableName)<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      .setRegionReplication(3)<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>      .setColumnFamilies(<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>        Arrays.stream(families)<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>         .map(fam -&gt; 
ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(fam)).build())<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>         .collect(Collectors.toList()))<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>      .build();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    RegionInfo[] regions = 
ModifyRegionUtils.createRegionInfos(htd, splitKeys);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      new 
CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>    splitAndTruncate(tableName, 
regions);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>  private void splitAndTruncate(TableName 
tableName, RegionInfo[] regions) throws IOException,<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    InterruptedException {<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span>    // split a region<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>    UTIL.getAdmin().split(tableName, new 
byte[]{'0'});<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>    // wait until split really happens<a 
name="line.361"></a>
-<span class="sourceLineNo">362</span>    while 
(UTIL.getAdmin().getRegions(tableName).size() &lt;= regions.length) {<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>      Thread.sleep(50);<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>    // disable the table<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>    
UTIL.getAdmin().disableTable(tableName);<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>    // truncate the table<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      new 
TruncateTableProcedure(procExec.getEnvironment(), tableName, true));<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>  }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>}<a name="line.377"></a>
+<span class="sourceLineNo">338</span>    TableDescriptor htd = 
TableDescriptorBuilder.newBuilder(tableName).setRegionReplication(3)<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>      
.setColumnFamilies(Arrays.stream(families)<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        .map(fam -&gt; 
ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(fam)).build())<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>        .collect(Collectors.toList()))<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>      .build();<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    RegionInfo[] regions = 
ModifyRegionUtils.createRegionInfos(htd, splitKeys);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      new 
CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>    splitAndTruncate(tableName, regions, 
3);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>  private void splitAndTruncate(TableName 
tableName, RegionInfo[] regions, int regionReplication)<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      throws IOException, 
InterruptedException {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    // split a region<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>    UTIL.getAdmin().split(tableName, new 
byte[] { '0' });<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>    // wait until split really happens<a 
name="line.358"></a>
+<span class="sourceLineNo">359</span>    UTIL.waitFor(60000,<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>      () -&gt; 
UTIL.getAdmin().getRegions(tableName).size() &gt; regions.length * 
regionReplication);<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>    // disable the table<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>    
UTIL.getAdmin().disableTable(tableName);<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>    // truncate the table<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      new 
TruncateTableProcedure(procExec.getEnvironment(), tableName, true));<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    // confirm that we have the correct 
number of regions<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    assertEquals((regions.length + 1) * 
regionReplication,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      
UTIL.getAdmin().getRegions(tableName).size());<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>}<a name="line.376"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/a839f85f/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.html
index 5c2583e..0af43c6 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.html
@@ -63,12 +63,12 @@
 <span class="sourceLineNo">055</span>import org.slf4j.LoggerFactory;<a 
name="line.55"></a>
 <span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;<a 
name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>@Category({MasterTests.class, 
MediumTests.class})<a name="line.58"></a>
+<span class="sourceLineNo">058</span>@Category({ MasterTests.class, 
MediumTests.class })<a name="line.58"></a>
 <span class="sourceLineNo">059</span>public class TestTruncateTableProcedure 
extends TestTableDDLProcedureBase {<a name="line.59"></a>
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>  @ClassRule<a name="line.61"></a>
 <span class="sourceLineNo">062</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      
HBaseClassTestRule.forClass(TestTruncateTableProcedure.class);<a 
name="line.63"></a>
+<span class="sourceLineNo">063</span>    
HBaseClassTestRule.forClass(TestTruncateTableProcedure.class);<a 
name="line.63"></a>
 <span class="sourceLineNo">064</span><a name="line.64"></a>
 <span class="sourceLineNo">065</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestTruncateTableProcedure.class);<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
@@ -324,7 +324,7 @@
 <span class="sourceLineNo">316</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a 
name="line.316"></a>
 <span class="sourceLineNo">317</span>  }<a name="line.317"></a>
 <span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>  @Test(timeout = 60000)<a 
name="line.319"></a>
+<span class="sourceLineNo">319</span>  @Test<a name="line.319"></a>
 <span class="sourceLineNo">320</span>  public void 
testTruncateWithPreserveAfterSplit() throws Exception {<a name="line.320"></a>
 <span class="sourceLineNo">321</span>    String[] families = new String[] { 
"f1", "f2" };<a name="line.321"></a>
 <span class="sourceLineNo">322</span>    byte[][] splitKeys =<a 
name="line.322"></a>
@@ -332,10 +332,10 @@
 <span class="sourceLineNo">324</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.324"></a>
 <span class="sourceLineNo">325</span>    RegionInfo[] regions = 
MasterProcedureTestingUtility.createTable(getMasterProcedureExecutor(),<a 
name="line.325"></a>
 <span class="sourceLineNo">326</span>      tableName, splitKeys, families);<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>    splitAndTruncate(tableName, 
regions);<a name="line.327"></a>
+<span class="sourceLineNo">327</span>    splitAndTruncate(tableName, regions, 
1);<a name="line.327"></a>
 <span class="sourceLineNo">328</span>  }<a name="line.328"></a>
 <span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>  @Test(timeout = 60000)<a 
name="line.330"></a>
+<span class="sourceLineNo">330</span>  @Test<a name="line.330"></a>
 <span class="sourceLineNo">331</span>  public void 
testTruncatePreserveWithReplicaRegionAfterSplit() throws Exception {<a 
name="line.331"></a>
 <span class="sourceLineNo">332</span>    String[] families = new String[] { 
"f1", "f2" };<a name="line.332"></a>
 <span class="sourceLineNo">333</span>    byte[][] splitKeys =<a 
name="line.333"></a>
@@ -343,46 +343,45 @@
 <span class="sourceLineNo">335</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.335"></a>
 <span class="sourceLineNo">336</span><a name="line.336"></a>
 <span class="sourceLineNo">337</span>    // create a table with region 
replications<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    TableDescriptor htd = 
TableDescriptorBuilder.newBuilder(tableName)<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      .setRegionReplication(3)<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>      .setColumnFamilies(<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>        Arrays.stream(families)<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>         .map(fam -&gt; 
ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(fam)).build())<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>         .collect(Collectors.toList()))<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>      .build();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    RegionInfo[] regions = 
ModifyRegionUtils.createRegionInfos(htd, splitKeys);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      new 
CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>    splitAndTruncate(tableName, 
regions);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>  private void splitAndTruncate(TableName 
tableName, RegionInfo[] regions) throws IOException,<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    InterruptedException {<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span>    // split a region<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>    UTIL.getAdmin().split(tableName, new 
byte[]{'0'});<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>    // wait until split really happens<a 
name="line.361"></a>
-<span class="sourceLineNo">362</span>    while 
(UTIL.getAdmin().getRegions(tableName).size() &lt;= regions.length) {<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>      Thread.sleep(50);<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>    // disable the table<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>    
UTIL.getAdmin().disableTable(tableName);<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>    // truncate the table<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      new 
TruncateTableProcedure(procExec.getEnvironment(), tableName, true));<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>  }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>}<a name="line.377"></a>
+<span class="sourceLineNo">338</span>    TableDescriptor htd = 
TableDescriptorBuilder.newBuilder(tableName).setRegionReplication(3)<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>      
.setColumnFamilies(Arrays.stream(families)<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        .map(fam -&gt; 
ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(fam)).build())<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>        .collect(Collectors.toList()))<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>      .build();<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    RegionInfo[] regions = 
ModifyRegionUtils.createRegionInfos(htd, splitKeys);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      new 
CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>    splitAndTruncate(tableName, regions, 
3);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>  private void splitAndTruncate(TableName 
tableName, RegionInfo[] regions, int regionReplication)<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      throws IOException, 
InterruptedException {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    // split a region<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>    UTIL.getAdmin().split(tableName, new 
byte[] { '0' });<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>    // wait until split really happens<a 
name="line.358"></a>
+<span class="sourceLineNo">359</span>    UTIL.waitFor(60000,<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>      () -&gt; 
UTIL.getAdmin().getRegions(tableName).size() &gt; regions.length * 
regionReplication);<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>    // disable the table<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>    
UTIL.getAdmin().disableTable(tableName);<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>    // truncate the table<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>    
ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec = 
getMasterProcedureExecutor();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExec,<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      new 
TruncateTableProcedure(procExec.getEnvironment(), tableName, true));<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>    
UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    // confirm that we have the correct 
number of regions<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    assertEquals((regions.length + 1) * 
regionReplication,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      
UTIL.getAdmin().getRegions(tableName).size());<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>}<a name="line.376"></a>
 
 
 

Reply via email to