You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/05/10 14:48:01 UTC
[01/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site f8e1a11ba -> 15a025c18
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html
new file mode 100644
index 0000000..3f4e29c
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html
@@ -0,0 +1,139 @@
+<!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;<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.assertFalse;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.junit.AfterClass;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.junit.BeforeClass;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.junit.ClassRule;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.junit.Test;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.junit.experimental.categories.Category;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.slf4j.Logger;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.slf4j.LoggerFactory;<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> * Make sure we can spin up a HBTU without a hbase-site.xml<a name="line.36"></a>
+<span class="sourceLineNo">037</span> */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>@Category({MiscTests.class, MediumTests.class})<a name="line.38"></a>
+<span class="sourceLineNo">039</span>public class TestHBaseTestingUtilSpinup {<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> @ClassRule<a name="line.41"></a>
+<span class="sourceLineNo">042</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.42"></a>
+<span class="sourceLineNo">043</span> HBaseClassTestRule.forClass(TestHBaseTestingUtilSpinup.class);<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> private static final Logger LOG = LoggerFactory.getLogger(TestHBaseTestingUtilSpinup.class);<a name="line.45"></a>
+<span class="sourceLineNo">046</span> private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span> @BeforeClass<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public static void beforeClass() throws Exception {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> UTIL.startMiniCluster();<a name="line.50"></a>
+<span class="sourceLineNo">051</span> if (!UTIL.getHBaseCluster().waitForActiveAndReadyMaster(30000)) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> throw new RuntimeException("Active master not ready");<a name="line.52"></a>
+<span class="sourceLineNo">053</span> }<a name="line.53"></a>
+<span class="sourceLineNo">054</span> }<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> @AfterClass<a name="line.56"></a>
+<span class="sourceLineNo">057</span> public static void afterClass() throws Exception {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> UTIL.shutdownMiniCluster();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> @Test<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public void testGetMetaTableRows() throws Exception {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> List<byte[]> results = UTIL.getMetaTableRows();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> assertFalse("results should have some entries and is empty.", results.isEmpty());<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>}<a name="line.67"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
index 5770648..97c4d20 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
@@ -444,29 +444,42 @@
<span class="sourceLineNo">436</span> }<a name="line.436"></a>
<span class="sourceLineNo">437</span><a name="line.437"></a>
<span class="sourceLineNo">438</span> @Test<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public void testOverridingOfDefaultPorts() {<a name="line.439"></a>
+<span class="sourceLineNo">439</span> public void testOverridingOfDefaultPorts() throws Exception {<a name="line.439"></a>
<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span> // confirm that default port properties being overridden to "-1"<a name="line.441"></a>
+<span class="sourceLineNo">441</span> // confirm that default port properties being overridden to random<a name="line.441"></a>
<span class="sourceLineNo">442</span> Configuration defaultConfig = HBaseConfiguration.create();<a name="line.442"></a>
<span class="sourceLineNo">443</span> defaultConfig.setInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> defaultConfig.setInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> HBaseTestingUtility htu = new HBaseTestingUtility(defaultConfig);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> assertEquals(-1, htu.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));<a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertEquals(-1, htu.getConfiguration().getInt(HConstants.REGIONSERVER_PORT, 0));<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> // confirm that nonDefault (custom) port settings are NOT overridden<a name="line.449"></a>
-<span class="sourceLineNo">450</span> Configuration altConfig = HBaseConfiguration.create();<a name="line.450"></a>
-<span class="sourceLineNo">451</span> final int nonDefaultMasterInfoPort = 3333;<a name="line.451"></a>
-<span class="sourceLineNo">452</span> final int nonDefaultRegionServerPort = 4444;<a name="line.452"></a>
-<span class="sourceLineNo">453</span> altConfig.setInt(HConstants.MASTER_INFO_PORT, nonDefaultMasterInfoPort);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> altConfig.setInt(HConstants.REGIONSERVER_PORT, nonDefaultRegionServerPort);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> htu = new HBaseTestingUtility(altConfig);<a name="line.455"></a>
-<span class="sourceLineNo">456</span> assertEquals(nonDefaultMasterInfoPort,<a name="line.456"></a>
-<span class="sourceLineNo">457</span> htu.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));<a name="line.457"></a>
-<span class="sourceLineNo">458</span> assertEquals(nonDefaultRegionServerPort<a name="line.458"></a>
-<span class="sourceLineNo">459</span> , htu.getConfiguration().getInt(HConstants.REGIONSERVER_PORT, 0));<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span>}<a name="line.461"></a>
+<span class="sourceLineNo">444</span> defaultConfig.setInt(HConstants.REGIONSERVER_INFO_PORT,<a name="line.444"></a>
+<span class="sourceLineNo">445</span> HConstants.DEFAULT_REGIONSERVER_INFOPORT);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> HBaseTestingUtility htu = new HBaseTestingUtility(defaultConfig);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> try {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> MiniHBaseCluster defaultCluster = htu.startMiniCluster();<a name="line.448"></a>
+<span class="sourceLineNo">449</span> assertNotEquals(HConstants.DEFAULT_MASTER_INFOPORT,<a name="line.449"></a>
+<span class="sourceLineNo">450</span> defaultCluster.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));<a name="line.450"></a>
+<span class="sourceLineNo">451</span> assertNotEquals(HConstants.DEFAULT_REGIONSERVER_INFOPORT,<a name="line.451"></a>
+<span class="sourceLineNo">452</span> defaultCluster.getConfiguration().getInt(HConstants.REGIONSERVER_INFO_PORT, 0));<a name="line.452"></a>
+<span class="sourceLineNo">453</span> } finally {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> htu.shutdownMiniCluster();<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> // confirm that nonDefault (custom) port settings are NOT overridden<a name="line.457"></a>
+<span class="sourceLineNo">458</span> Configuration altConfig = HBaseConfiguration.create();<a name="line.458"></a>
+<span class="sourceLineNo">459</span> final int nonDefaultMasterInfoPort = 3333;<a name="line.459"></a>
+<span class="sourceLineNo">460</span> final int nonDefaultRegionServerPort = 4444;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> altConfig.setInt(HConstants.MASTER_INFO_PORT, nonDefaultMasterInfoPort);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> altConfig.setInt(HConstants.REGIONSERVER_INFO_PORT, nonDefaultRegionServerPort);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> htu = new HBaseTestingUtility(altConfig);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> try {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> MiniHBaseCluster customCluster = htu.startMiniCluster();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> assertEquals(nonDefaultMasterInfoPort,<a name="line.466"></a>
+<span class="sourceLineNo">467</span> customCluster.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));<a name="line.467"></a>
+<span class="sourceLineNo">468</span> assertEquals(nonDefaultRegionServerPort,<a name="line.468"></a>
+<span class="sourceLineNo">469</span> customCluster.getConfiguration().getInt(HConstants.REGIONSERVER_INFO_PORT, 0));<a name="line.469"></a>
+<span class="sourceLineNo">470</span> } finally {<a name="line.470"></a>
+<span class="sourceLineNo">471</span> htu.shutdownMiniCluster();<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span>}<a name="line.474"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
index 85bfe9c..4c7137a 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
@@ -26,138 +26,147 @@
<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.io.hfile.bucket;<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.assertArrayEquals;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static org.junit.Assert.assertFalse;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static org.junit.Assert.assertNotNull;<a name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.io.File;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.IOException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.nio.ByteBuffer;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.nio.channels.FileChannel;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.ArrayList;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.List;<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.io.hfile.bucket.TestByteBufferIOEngine.BufferGrabbingDeserializer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.junit.After;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.junit.Before;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.junit.ClassRule;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.Test;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.experimental.categories.Category;<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Basic test for {@link FileIOEngine}<a name="line.42"></a>
-<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@Category({IOTests.class, SmallTests.class})<a name="line.44"></a>
-<span class="sourceLineNo">045</span>public class TestFileIOEngine {<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> @ClassRule<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.48"></a>
-<span class="sourceLineNo">049</span> HBaseClassTestRule.forClass(TestFileIOEngine.class);<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> private static final long TOTAL_CAPACITY = 6 * 1024 * 1024; // 6 MB<a name="line.51"></a>
-<span class="sourceLineNo">052</span> private static final String[] FILE_PATHS = {"testFileIOEngine1", "testFileIOEngine2",<a name="line.52"></a>
-<span class="sourceLineNo">053</span> "testFileIOEngine3"};<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private static final long SIZE_PER_FILE = TOTAL_CAPACITY / FILE_PATHS.length; // 2 MB per File<a name="line.54"></a>
-<span class="sourceLineNo">055</span> private final static List<Long> boundaryStartPositions = new ArrayList<Long>();<a name="line.55"></a>
-<span class="sourceLineNo">056</span> private final static List<Long> boundaryStopPositions = new ArrayList<Long>();<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span> private FileIOEngine fileIOEngine;<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> static {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> boundaryStartPositions.add(0L);<a name="line.61"></a>
-<span class="sourceLineNo">062</span> for (int i = 1; i < FILE_PATHS.length; i++) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> boundaryStartPositions.add(SIZE_PER_FILE * i - 1);<a name="line.63"></a>
-<span class="sourceLineNo">064</span> boundaryStartPositions.add(SIZE_PER_FILE * i);<a name="line.64"></a>
-<span class="sourceLineNo">065</span> boundaryStartPositions.add(SIZE_PER_FILE * i + 1);<a name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span> for (int i = 1; i < FILE_PATHS.length; i++) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> boundaryStopPositions.add(SIZE_PER_FILE * i - 1);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> boundaryStopPositions.add(SIZE_PER_FILE * i);<a name="line.69"></a>
-<span class="sourceLineNo">070</span> boundaryStopPositions.add(SIZE_PER_FILE * i + 1);<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> boundaryStopPositions.add(SIZE_PER_FILE * FILE_PATHS.length - 1);<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> @Before<a name="line.75"></a>
-<span class="sourceLineNo">076</span> public void setUp() throws IOException {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> fileIOEngine = new FileIOEngine(TOTAL_CAPACITY, false, FILE_PATHS);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> @After<a name="line.80"></a>
-<span class="sourceLineNo">081</span> public void cleanUp() {<a name="line.81"></a>
-<span class="sourceLineNo">082</span> fileIOEngine.shutdown();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> for (String filePath : FILE_PATHS) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> File file = new File(filePath);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> if (file.exists()) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> file.delete();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> @Test<a name="line.91"></a>
-<span class="sourceLineNo">092</span> public void testFileIOEngine() throws IOException {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> for (int i = 0; i < 500; i++) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> int len = (int) Math.floor(Math.random() * 100) + 1;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> long offset = (long) Math.floor(Math.random() * TOTAL_CAPACITY % (TOTAL_CAPACITY - len));<a name="line.95"></a>
-<span class="sourceLineNo">096</span> if (i < boundaryStartPositions.size()) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> // make the boundary start positon<a name="line.97"></a>
-<span class="sourceLineNo">098</span> offset = boundaryStartPositions.get(i);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> } else if ((i - boundaryStartPositions.size()) < boundaryStopPositions.size()) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> // make the boundary stop positon<a name="line.100"></a>
-<span class="sourceLineNo">101</span> offset = boundaryStopPositions.get(i - boundaryStartPositions.size()) - len + 1;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> } else if (i % 2 == 0) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> // make the cross-files block writing/reading<a name="line.103"></a>
-<span class="sourceLineNo">104</span> offset = Math.max(1, i % FILE_PATHS.length) * SIZE_PER_FILE - len / 2;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span> byte[] data1 = new byte[len];<a name="line.106"></a>
-<span class="sourceLineNo">107</span> for (int j = 0; j < data1.length; ++j) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> data1[j] = (byte) (Math.random() * 255);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span> fileIOEngine.write(ByteBuffer.wrap(data1), offset);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> BufferGrabbingDeserializer deserializer = new BufferGrabbingDeserializer();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> fileIOEngine.read(offset, len, deserializer);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> ByteBuff data2 = deserializer.getDeserializedByteBuff();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> assertArrayEquals(data1, data2.array());<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> @Test<a name="line.118"></a>
-<span class="sourceLineNo">119</span> public void testFileIOEngineHandlesZeroLengthInput() throws IOException {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> byte[] data1 = new byte[0];<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> fileIOEngine.write(ByteBuffer.wrap(data1), 0);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> BufferGrabbingDeserializer deserializer = new BufferGrabbingDeserializer();<a name="line.123"></a>
-<span class="sourceLineNo">124</span> fileIOEngine.read(0, 0, deserializer);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> ByteBuff data2 = deserializer.getDeserializedByteBuff();<a name="line.125"></a>
-<span class="sourceLineNo">126</span> assertArrayEquals(data1, data2.array());<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
-<span class="sourceLineNo">130</span> public void testClosedChannelException() throws IOException {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> fileIOEngine.closeFileChannels();<a name="line.131"></a>
-<span class="sourceLineNo">132</span> int len = 5;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> long offset = 0L;<a name="line.133"></a>
-<span class="sourceLineNo">134</span> byte[] data1 = new byte[len];<a name="line.134"></a>
-<span class="sourceLineNo">135</span> for (int j = 0; j < data1.length; ++j) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> data1[j] = (byte) (Math.random() * 255);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span> fileIOEngine.write(ByteBuffer.wrap(data1), offset);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> BufferGrabbingDeserializer deserializer = new BufferGrabbingDeserializer();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> fileIOEngine.read(offset, len, deserializer);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> ByteBuff data2 = deserializer.getDeserializedByteBuff();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> assertArrayEquals(data1, data2.array());<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<a name="line.145"></a>
-<span class="sourceLineNo">146</span> public void testRefreshFileConnectionClosesConnections() throws IOException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> FileChannel fileChannel = fileIOEngine.getFileChannels()[0];<a name="line.147"></a>
-<span class="sourceLineNo">148</span> assertNotNull(fileChannel);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> fileIOEngine.refreshFileConnection(0);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> assertFalse(fileChannel.isOpen());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>}<a name="line.152"></a>
+<span class="sourceLineNo">021</span>import static org.junit.Assert.assertEquals;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import static org.junit.Assert.assertNotEquals;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.assertNotNull;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.io.File;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.IOException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.nio.ByteBuffer;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.nio.channels.FileChannel;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.ArrayList;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.bucket.TestByteBufferIOEngine.BufferGrabbingDeserializer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.IOTests;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.After;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.Before;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.ClassRule;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.junit.Test;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.experimental.categories.Category;<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * Basic test for {@link FileIOEngine}<a name="line.43"></a>
+<span class="sourceLineNo">044</span> */<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@Category({IOTests.class, SmallTests.class})<a name="line.45"></a>
+<span class="sourceLineNo">046</span>public class TestFileIOEngine {<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span> @ClassRule<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.49"></a>
+<span class="sourceLineNo">050</span> HBaseClassTestRule.forClass(TestFileIOEngine.class);<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> private static final long TOTAL_CAPACITY = 6 * 1024 * 1024; // 6 MB<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private static final String[] FILE_PATHS = {"testFileIOEngine1", "testFileIOEngine2",<a name="line.53"></a>
+<span class="sourceLineNo">054</span> "testFileIOEngine3"};<a name="line.54"></a>
+<span class="sourceLineNo">055</span> private static final long SIZE_PER_FILE = TOTAL_CAPACITY / FILE_PATHS.length; // 2 MB per File<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private final static List<Long> boundaryStartPositions = new ArrayList<Long>();<a name="line.56"></a>
+<span class="sourceLineNo">057</span> private final static List<Long> boundaryStopPositions = new ArrayList<Long>();<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span> private FileIOEngine fileIOEngine;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> static {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> boundaryStartPositions.add(0L);<a name="line.62"></a>
+<span class="sourceLineNo">063</span> for (int i = 1; i < FILE_PATHS.length; i++) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> boundaryStartPositions.add(SIZE_PER_FILE * i - 1);<a name="line.64"></a>
+<span class="sourceLineNo">065</span> boundaryStartPositions.add(SIZE_PER_FILE * i);<a name="line.65"></a>
+<span class="sourceLineNo">066</span> boundaryStartPositions.add(SIZE_PER_FILE * i + 1);<a name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span> for (int i = 1; i < FILE_PATHS.length; i++) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> boundaryStopPositions.add(SIZE_PER_FILE * i - 1);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> boundaryStopPositions.add(SIZE_PER_FILE * i);<a name="line.70"></a>
+<span class="sourceLineNo">071</span> boundaryStopPositions.add(SIZE_PER_FILE * i + 1);<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span> boundaryStopPositions.add(SIZE_PER_FILE * FILE_PATHS.length - 1);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> @Before<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public void setUp() throws IOException {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> fileIOEngine = new FileIOEngine(TOTAL_CAPACITY, false, FILE_PATHS);<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> @After<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public void cleanUp() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> fileIOEngine.shutdown();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> for (String filePath : FILE_PATHS) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> File file = new File(filePath);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (file.exists()) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> file.delete();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> @Test<a name="line.92"></a>
+<span class="sourceLineNo">093</span> public void testFileIOEngine() throws IOException {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> for (int i = 0; i < 500; i++) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> int len = (int) Math.floor(Math.random() * 100) + 1;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> long offset = (long) Math.floor(Math.random() * TOTAL_CAPACITY % (TOTAL_CAPACITY - len));<a name="line.96"></a>
+<span class="sourceLineNo">097</span> if (i < boundaryStartPositions.size()) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> // make the boundary start positon<a name="line.98"></a>
+<span class="sourceLineNo">099</span> offset = boundaryStartPositions.get(i);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> } else if ((i - boundaryStartPositions.size()) < boundaryStopPositions.size()) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> // make the boundary stop positon<a name="line.101"></a>
+<span class="sourceLineNo">102</span> offset = boundaryStopPositions.get(i - boundaryStartPositions.size()) - len + 1;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> } else if (i % 2 == 0) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> // make the cross-files block writing/reading<a name="line.104"></a>
+<span class="sourceLineNo">105</span> offset = Math.max(1, i % FILE_PATHS.length) * SIZE_PER_FILE - len / 2;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span> byte[] data1 = new byte[len];<a name="line.107"></a>
+<span class="sourceLineNo">108</span> for (int j = 0; j < data1.length; ++j) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> data1[j] = (byte) (Math.random() * 255);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> }<a name="line.110"></a>
+<span class="sourceLineNo">111</span> fileIOEngine.write(ByteBuffer.wrap(data1), offset);<a name="line.111"></a>
+<span class="sourceLineNo">112</span> BufferGrabbingDeserializer deserializer = new BufferGrabbingDeserializer();<a name="line.112"></a>
+<span class="sourceLineNo">113</span> fileIOEngine.read(offset, len, deserializer);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> ByteBuff data2 = deserializer.getDeserializedByteBuff();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> assertArrayEquals(data1, data2.array());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public void testFileIOEngineHandlesZeroLengthInput() throws IOException {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> byte[] data1 = new byte[0];<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> fileIOEngine.write(ByteBuffer.wrap(data1), 0);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> BufferGrabbingDeserializer deserializer = new BufferGrabbingDeserializer();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> fileIOEngine.read(0, 0, deserializer);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ByteBuff data2 = deserializer.getDeserializedByteBuff();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> assertArrayEquals(data1, data2.array());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Test<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public void testClosedChannelException() throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> fileIOEngine.closeFileChannels();<a name="line.132"></a>
+<span class="sourceLineNo">133</span> int len = 5;<a name="line.133"></a>
+<span class="sourceLineNo">134</span> long offset = 0L;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> byte[] data1 = new byte[len];<a name="line.135"></a>
+<span class="sourceLineNo">136</span> for (int j = 0; j < data1.length; ++j) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> data1[j] = (byte) (Math.random() * 255);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> fileIOEngine.write(ByteBuffer.wrap(data1), offset);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> BufferGrabbingDeserializer deserializer = new BufferGrabbingDeserializer();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> fileIOEngine.read(offset, len, deserializer);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> ByteBuff data2 = deserializer.getDeserializedByteBuff();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> assertArrayEquals(data1, data2.array());<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<a name="line.146"></a>
+<span class="sourceLineNo">147</span> public void testRefreshFileConnection() throws IOException {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> FileChannel[] fileChannels = fileIOEngine.getFileChannels();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> FileChannel fileChannel = fileChannels[0];<a name="line.149"></a>
+<span class="sourceLineNo">150</span> assertNotNull(fileChannel);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> fileChannel.close();<a name="line.151"></a>
+<span class="sourceLineNo">152</span> fileIOEngine.refreshFileConnection(0, new IOException("Test Exception"));<a name="line.152"></a>
+<span class="sourceLineNo">153</span> FileChannel[] reopenedFileChannels = fileIOEngine.getFileChannels();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> FileChannel reopenedFileChannel = reopenedFileChannels[0];<a name="line.154"></a>
+<span class="sourceLineNo">155</span> assertNotEquals(fileChannel, reopenedFileChannel);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> assertEquals(fileChannels.length, reopenedFileChannels.length);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> for (int i = 1; i < fileChannels.length; i++) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> assertEquals(fileChannels[i], reopenedFileChannels[i]);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>}<a name="line.161"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
index 754450b..68328a9 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
@@ -57,10 +57,10 @@
<span class="sourceLineNo">049</span> protected static final Logger LOG = LoggerFactory.getLogger(TestEnableRSGroup.class);<a name="line.49"></a>
<span class="sourceLineNo">050</span><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 Configuration conf = TEST_UTIL.getConfiguration();<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> @BeforeClass<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public static void setUp() throws Exception {<a name="line.55"></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> final Configuration conf = TEST_UTIL.getConfiguration();<a name="line.55"></a>
<span class="sourceLineNo">056</span> conf.setBoolean(CoprocessorHost.COPROCESSORS_ENABLED_CONF_KEY, true);<a name="line.56"></a>
<span class="sourceLineNo">057</span> TEST_UTIL.startMiniCluster(5);<a name="line.57"></a>
<span class="sourceLineNo">058</span> }<a name="line.58"></a>
@@ -77,9 +77,9 @@
<span class="sourceLineNo">069</span> TEST_UTIL.getMiniHBaseCluster().waitOnMaster(0);<a name="line.69"></a>
<span class="sourceLineNo">070</span><a name="line.70"></a>
<span class="sourceLineNo">071</span> LOG.info("stopped master...");<a name="line.71"></a>
-<span class="sourceLineNo">072</span> conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, RSGroupAdminEndpoint.class.getName());<a name="line.72"></a>
-<span class="sourceLineNo">073</span> conf.set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, RSGroupBasedLoadBalancer.class.getName());<a name="line.73"></a>
-<span class="sourceLineNo">074</span> TEST_UTIL.getMiniHBaseCluster().setConf(conf);<a name="line.74"></a>
+<span class="sourceLineNo">072</span> final Configuration conf = TEST_UTIL.getConfiguration();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, RSGroupAdminEndpoint.class.getName());<a name="line.73"></a>
+<span class="sourceLineNo">074</span> conf.set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, RSGroupBasedLoadBalancer.class.getName());<a name="line.74"></a>
<span class="sourceLineNo">075</span><a name="line.75"></a>
<span class="sourceLineNo">076</span> TEST_UTIL.getMiniHBaseCluster().startMaster();<a name="line.76"></a>
<span class="sourceLineNo">077</span> TEST_UTIL.getMiniHBaseCluster().waitForActiveAndReadyMaster(60000);<a name="line.77"></a>
[34/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
Published site at 8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/15a025c1
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/15a025c1
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/15a025c1
Branch: refs/heads/asf-site
Commit: 15a025c186a3dc63a47af5d9247417eb8de824ae
Parents: f8e1a11
Author: jenkins <bu...@apache.org>
Authored: Thu May 10 14:47:42 2018 +0000
Committer: jenkins <bu...@apache.org>
Committed: Thu May 10 14:47:42 2018 +0000
----------------------------------------------------------------------
acid-semantics.html | 4 +-
apache_hbase_reference_guide.pdf | 4 +-
.../apache/hadoop/hbase/LocalHBaseCluster.html | 46 +-
.../apache/hadoop/hbase/LocalHBaseCluster.html | 583 +-
book.html | 2 +-
bulk-loads.html | 4 +-
checkstyle-aggregate.html | 18158 ++++++++---------
checkstyle.rss | 20 +-
coc.html | 4 +-
dependencies.html | 4 +-
dependency-convergence.html | 4 +-
dependency-info.html | 4 +-
dependency-management.html | 4 +-
devapidocs/constant-values.html | 6 +-
devapidocs/index-all.html | 4 +-
.../apache/hadoop/hbase/LocalHBaseCluster.html | 46 +-
.../hadoop/hbase/backup/package-tree.html | 4 +-
.../hadoop/hbase/client/package-tree.html | 28 +-
.../hadoop/hbase/executor/package-tree.html | 2 +-
.../hadoop/hbase/filter/package-tree.html | 10 +-
.../hfile/bucket/FileIOEngine.FileAccessor.html | 4 +-
.../bucket/FileIOEngine.FileReadAccessor.html | 6 +-
.../bucket/FileIOEngine.FileWriteAccessor.html | 6 +-
.../hbase/io/hfile/bucket/FileIOEngine.html | 81 +-
.../hadoop/hbase/io/hfile/package-tree.html | 6 +-
.../apache/hadoop/hbase/ipc/package-tree.html | 2 +-
.../hadoop/hbase/mapreduce/package-tree.html | 6 +-
.../hbase/master/balancer/BaseLoadBalancer.html | 18 +-
.../hbase/master/balancer/package-tree.html | 2 +-
.../master/cleaner/CleanerChore.Action.html | 4 +-
.../cleaner/CleanerChore.CleanerTask.html | 18 +-
.../hbase/master/cleaner/CleanerChore.html | 18 +-
.../hadoop/hbase/master/package-tree.html | 4 +-
.../hbase/master/procedure/package-tree.html | 2 +-
.../org/apache/hadoop/hbase/package-tree.html | 16 +-
.../hadoop/hbase/procedure2/package-tree.html | 4 +-
.../hadoop/hbase/quotas/package-tree.html | 8 +-
.../hadoop/hbase/regionserver/package-tree.html | 20 +-
.../regionserver/querymatcher/package-tree.html | 2 +-
.../hadoop/hbase/rest/model/package-tree.html | 2 +-
.../hbase/security/access/package-tree.html | 4 +-
.../hadoop/hbase/security/package-tree.html | 2 +-
.../hadoop/hbase/thrift/package-tree.html | 2 +-
.../apache/hadoop/hbase/util/package-tree.html | 10 +-
.../apache/hadoop/hbase/LocalHBaseCluster.html | 583 +-
.../org/apache/hadoop/hbase/Version.html | 6 +-
.../hfile/bucket/FileIOEngine.FileAccessor.html | 586 +-
.../bucket/FileIOEngine.FileReadAccessor.html | 586 +-
.../bucket/FileIOEngine.FileWriteAccessor.html | 586 +-
.../hbase/io/hfile/bucket/FileIOEngine.html | 586 +-
.../BaseLoadBalancer.Cluster.Action.Type.html | 299 +-
.../BaseLoadBalancer.Cluster.Action.html | 299 +-
...LoadBalancer.Cluster.AssignRegionAction.html | 299 +-
.../BaseLoadBalancer.Cluster.LocalityType.html | 299 +-
...seLoadBalancer.Cluster.MoveRegionAction.html | 299 +-
...eLoadBalancer.Cluster.SwapRegionsAction.html | 299 +-
.../balancer/BaseLoadBalancer.Cluster.html | 299 +-
.../BaseLoadBalancer.DefaultRackManager.html | 299 +-
.../hbase/master/balancer/BaseLoadBalancer.html | 299 +-
.../master/cleaner/CleanerChore.Action.html | 600 +-
.../cleaner/CleanerChore.CleanerTask.html | 600 +-
.../cleaner/CleanerChore.DirScanPool.html | 600 +-
.../hbase/master/cleaner/CleanerChore.html | 600 +-
downloads.html | 4 +-
export_control.html | 4 +-
index.html | 4 +-
integration.html | 4 +-
issue-tracking.html | 4 +-
license.html | 4 +-
mail-lists.html | 4 +-
metrics.html | 4 +-
old_news.html | 4 +-
plugin-management.html | 4 +-
plugins.html | 4 +-
poweredbyhbase.html | 4 +-
project-info.html | 4 +-
project-reports.html | 4 +-
project-summary.html | 4 +-
pseudo-distributed.html | 4 +-
replication.html | 4 +-
resources.html | 4 +-
source-repository.html | 4 +-
sponsors.html | 4 +-
supportingprojects.html | 4 +-
team-list.html | 4 +-
.../hadoop/hbase/HBaseTestingUtility.html | 434 +-
.../apache/hadoop/hbase/MiniHBaseCluster.html | 128 +-
.../hadoop/hbase/HBaseTestingUtility.html | 7406 ++++---
.../apache/hadoop/hbase/MiniHBaseCluster.html | 1576 +-
testdevapidocs/allclasses-frame.html | 1 +
testdevapidocs/allclasses-noframe.html | 1 +
testdevapidocs/index-all.html | 22 +-
...lity.PortAllocator.AvailablePortChecker.html | 4 +-
.../HBaseTestingUtility.PortAllocator.html | 20 +-
.../HBaseTestingUtility.SeenRowTracker.html | 20 +-
.../hadoop/hbase/HBaseTestingUtility.html | 470 +-
...aseCluster.MiniHBaseClusterRegionServer.html | 22 +-
...eCluster.SingleFileSystemShutdownThread.html | 8 +-
.../apache/hadoop/hbase/MiniHBaseCluster.html | 132 +-
.../hbase/TestHBaseTestingUtilSpinup.html | 376 +
.../hadoop/hbase/TestHBaseTestingUtility.html | 11 +-
.../hadoop/hbase/TestHColumnDescriptor.html | 4 +-
.../hbase/class-use/HBaseClassTestRule.html | 4 +
.../hbase/class-use/HBaseTestingUtility.html | 4 +
.../class-use/TestHBaseTestingUtilSpinup.html | 125 +
.../hbase/io/hfile/bucket/TestFileIOEngine.html | 38 +-
.../org/apache/hadoop/hbase/package-frame.html | 1 +
.../apache/hadoop/hbase/package-summary.html | 122 +-
.../org/apache/hadoop/hbase/package-tree.html | 7 +-
.../hadoop/hbase/procedure/package-tree.html | 8 +-
.../hadoop/hbase/procedure2/package-tree.html | 4 +-
.../hadoop/hbase/regionserver/package-tree.html | 6 +-
.../hadoop/hbase/rsgroup/TestEnableRSGroup.html | 19 +-
.../apache/hadoop/hbase/test/package-tree.html | 6 +-
.../apache/hadoop/hbase/wal/package-tree.html | 4 +-
testdevapidocs/overview-tree.html | 1 +
...lity.PortAllocator.AvailablePortChecker.html | 7406 ++++---
.../HBaseTestingUtility.PortAllocator.html | 7406 ++++---
.../HBaseTestingUtility.SeenRowTracker.html | 7406 ++++---
.../hadoop/hbase/HBaseTestingUtility.html | 7406 ++++---
...aseCluster.MiniHBaseClusterRegionServer.html | 1576 +-
...eCluster.SingleFileSystemShutdownThread.html | 1576 +-
.../apache/hadoop/hbase/MiniHBaseCluster.html | 1576 +-
.../hbase/TestHBaseTestingUtilSpinup.html | 139 +
.../hadoop/hbase/TestHBaseTestingUtility.html | 53 +-
.../hbase/io/hfile/bucket/TestFileIOEngine.html | 273 +-
.../hadoop/hbase/rsgroup/TestEnableRSGroup.html | 14 +-
127 files changed, 37013 insertions(+), 36102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/acid-semantics.html
----------------------------------------------------------------------
diff --git a/acid-semantics.html b/acid-semantics.html
index 211bca3..09d2a49 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) ACID Properties
@@ -601,7 +601,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/apache_hbase_reference_guide.pdf
----------------------------------------------------------------------
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index db0494c..e07b290 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
/Author (Apache HBase Team)
/Creator (Asciidoctor PDF 1.5.0.alpha.15, based on Prawn 2.2.2)
/Producer (Apache HBase Team)
-/ModDate (D:20180509151357+00'00')
-/CreationDate (D:20180509152901+00'00')
+/ModDate (D:20180510142949+00'00')
+/CreationDate (D:20180510144450+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html b/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 33d9546..8a6ff31 100644
--- a/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -501,7 +501,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.171">addRegionServer</a>()
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.186">addRegionServer</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -515,7 +515,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.177">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.192">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
int index)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
@@ -530,7 +530,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.191">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.206">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
int index,
<a href="../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -548,7 +548,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addMaster</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.203">addMaster</a>()
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.218">addMaster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -562,7 +562,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addMaster</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.207">addMaster</a>(org.apache.hadoop.conf.Configuration c,
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.222">addMaster</a>(org.apache.hadoop.conf.Configuration c,
int index)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
@@ -577,7 +577,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addMaster</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.218">addMaster</a>(org.apache.hadoop.conf.Configuration c,
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.233">addMaster</a>(org.apache.hadoop.conf.Configuration c,
int index,
<a href="../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -595,7 +595,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.regionserver.HRegionServer <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.234">getRegionServer</a>(int serverNumber)</pre>
+<pre>public org.apache.hadoop.hbase.regionserver.HRegionServer <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.249">getRegionServer</a>(int serverNumber)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>serverNumber</code> - </dd>
@@ -610,7 +610,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getRegionServers</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.241">getRegionServers</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.256">getRegionServers</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Read-only list of region server threads.</dd>
@@ -623,7 +623,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getLiveRegionServers</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.250">getLiveRegionServers</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.265">getLiveRegionServers</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of running servers (Some servers may have been killed or
@@ -638,7 +638,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getConfiguration</h4>
-<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.263">getConfiguration</a>()</pre>
+<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.278">getConfiguration</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>the Configuration used by this LocalHBaseCluster</dd>
@@ -651,7 +651,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.271">waitOnRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.286">waitOnRegionServer</a>(int serverNumber)</pre>
<div class="block">Wait for the specified region server to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -665,7 +665,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.280">waitOnRegionServer</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread rst)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.295">waitOnRegionServer</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread rst)</pre>
<div class="block">Wait for the specified region server to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -679,7 +679,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.296">getMaster</a>(int serverNumber)</pre>
+<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.311">getMaster</a>(int serverNumber)</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>the HMaster thread</dd>
@@ -692,7 +692,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getActiveMaster</h4>
-<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.305">getActiveMaster</a>()</pre>
+<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.320">getActiveMaster</a>()</pre>
<div class="block">Gets the current active master, if available. If no active master, returns
null.</div>
<dl>
@@ -707,7 +707,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getMasters</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.319">getMasters</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.334">getMasters</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Read-only list of master threads.</dd>
@@ -720,7 +720,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getLiveMasters</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.328">getLiveMasters</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.343">getLiveMasters</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of running master servers (Some servers may have been killed
@@ -735,7 +735,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.343">waitOnMaster</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.358">waitOnMaster</a>(int serverNumber)</pre>
<div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -749,7 +749,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.352">waitOnMaster</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread masterThread)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.367">waitOnMaster</a>(org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread masterThread)</pre>
<div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -763,7 +763,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.369">join</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.384">join</a>()</pre>
<div class="block">Wait for Mini HBase Cluster to shut down.
Presumes you've already called <a href="../../../../org/apache/hadoop/hbase/LocalHBaseCluster.html#shutdown--"><code>shutdown()</code></a>.</div>
</li>
@@ -774,7 +774,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>startup</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.397">startup</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.412">startup</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Start the cluster.</div>
<dl>
@@ -789,7 +789,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>shutdown</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.404">shutdown</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.419">shutdown</a>()</pre>
<div class="block">Shut down the mini HBase cluster</div>
</li>
</ul>
@@ -799,7 +799,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>isLocal</h4>
-<pre>public static boolean <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.412">isLocal</a>(org.apache.hadoop.conf.Configuration c)</pre>
+<pre>public static boolean <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.427">isLocal</a>(org.apache.hadoop.conf.Configuration c)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>c</code> - Configuration to check.</dd>
@@ -814,7 +814,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.422">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.437">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Test things basically work.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 1d2d704..9aa09f0 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -147,303 +147,318 @@
<span class="sourceLineNo">139</span> throws IOException {<a name="line.139"></a>
<span class="sourceLineNo">140</span> this.conf = conf;<a name="line.140"></a>
<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // Always have masters and regionservers come up on port '0' so we don't<a name="line.142"></a>
-<span class="sourceLineNo">143</span> // clash over default ports.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> if (conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.145"></a>
-<span class="sourceLineNo">146</span> conf.set(HConstants.REGIONSERVER_PORT, "0");<a name="line.146"></a>
-<span class="sourceLineNo">147</span> if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> conf.set(HConstants.MASTER_INFO_PORT, "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> this.masterClass = (Class<? extends HMaster>)<a name="line.155"></a>
-<span class="sourceLineNo">156</span> conf.getClass(HConstants.MASTER_IMPL, masterClass);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // Start the HMasters.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> for (int i = 0; i < noMasters; i++) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> addMaster(new Configuration(conf), i);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span> // Start the HRegionServers.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> this.regionServerClass =<a name="line.162"></a>
-<span class="sourceLineNo">163</span> (Class<? extends HRegionServer>)conf.getClass(HConstants.REGION_SERVER_IMPL,<a name="line.163"></a>
-<span class="sourceLineNo">164</span> regionServerClass);<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> for (int i = 0; i < noRegionServers; i++) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> addRegionServer(new Configuration(conf), i);<a name="line.167"></a>
+<span class="sourceLineNo">142</span> // When active, if a port selection is default then we switch to random<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> if (conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT)<a name="line.144"></a>
+<span class="sourceLineNo">145</span> == HConstants.DEFAULT_MASTER_PORT) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> LOG.debug("Setting Master Port to random.");<a name="line.146"></a>
+<span class="sourceLineNo">147</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> LOG.debug("Setting RegionServer Port to random.");<a name="line.151"></a>
+<span class="sourceLineNo">152</span> conf.set(HConstants.REGIONSERVER_PORT, "0");<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> // treat info ports special; expressly don't change '-1' (keep off)<a name="line.154"></a>
+<span class="sourceLineNo">155</span> // in case we make that the default behavior.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1 &&<a name="line.156"></a>
+<span class="sourceLineNo">157</span> conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT)<a name="line.157"></a>
+<span class="sourceLineNo">158</span> == HConstants.DEFAULT_REGIONSERVER_INFOPORT) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> LOG.debug("Setting RS InfoServer Port to random.");<a name="line.159"></a>
+<span class="sourceLineNo">160</span> conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1 &&<a name="line.162"></a>
+<span class="sourceLineNo">163</span> conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.163"></a>
+<span class="sourceLineNo">164</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> LOG.debug("Setting Master InfoServer Port to random.");<a name="line.165"></a>
+<span class="sourceLineNo">166</span> conf.set(HConstants.MASTER_INFO_PORT, "0");<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> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> public JVMClusterUtil.RegionServerThread addRegionServer()<a name="line.171"></a>
-<span class="sourceLineNo">172</span> throws IOException {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> return addRegionServer(new Configuration(conf), this.regionThreads.size());<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> @SuppressWarnings("unchecked")<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.177"></a>
-<span class="sourceLineNo">178</span> Configuration config, final int index)<a name="line.178"></a>
-<span class="sourceLineNo">179</span> throws IOException {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Create each regionserver with its own Configuration instance so each has<a name="line.180"></a>
-<span class="sourceLineNo">181</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // the guts of ConnectionManager).<a name="line.182"></a>
-<span class="sourceLineNo">183</span> JVMClusterUtil.RegionServerThread rst =<a name="line.183"></a>
-<span class="sourceLineNo">184</span> JVMClusterUtil.createRegionServerThread(config, (Class<? extends HRegionServer>) conf<a name="line.184"></a>
-<span class="sourceLineNo">185</span> .getClass(HConstants.REGION_SERVER_IMPL, this.regionServerClass), index);<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> this.regionThreads.add(rst);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return rst;<a name="line.188"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> this.masterClass = (Class<? extends HMaster>)<a name="line.170"></a>
+<span class="sourceLineNo">171</span> conf.getClass(HConstants.MASTER_IMPL, masterClass);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // Start the HMasters.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < noMasters; i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> addMaster(new Configuration(conf), i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // Start the HRegionServers.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> this.regionServerClass =<a name="line.177"></a>
+<span class="sourceLineNo">178</span> (Class<? extends HRegionServer>)conf.getClass(HConstants.REGION_SERVER_IMPL,<a name="line.178"></a>
+<span class="sourceLineNo">179</span> regionServerClass);<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> for (int i = 0; i < noRegionServers; i++) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> addRegionServer(new Configuration(conf), i);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> public JVMClusterUtil.RegionServerThread addRegionServer()<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throws IOException {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return addRegionServer(new Configuration(conf), this.regionThreads.size());<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.191"></a>
-<span class="sourceLineNo">192</span> final Configuration config, final int index, User user)<a name="line.192"></a>
-<span class="sourceLineNo">193</span> throws IOException, InterruptedException {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> return user.runAs(<a name="line.194"></a>
-<span class="sourceLineNo">195</span> new PrivilegedExceptionAction<JVMClusterUtil.RegionServerThread>() {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> @Override<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public JVMClusterUtil.RegionServerThread run() throws Exception {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return addRegionServer(config, index);<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><a name="line.202"></a>
-<span class="sourceLineNo">203</span> public JVMClusterUtil.MasterThread addMaster() throws IOException {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return addMaster(new Configuration(conf), this.masterThreads.size());<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> public JVMClusterUtil.MasterThread addMaster(Configuration c, final int index)<a name="line.207"></a>
-<span class="sourceLineNo">208</span> throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // Create each master with its own Configuration instance so each has<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.210"></a>
-<span class="sourceLineNo">211</span> // the guts of ConnectionManager.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> JVMClusterUtil.MasterThread mt = JVMClusterUtil.createMasterThread(c,<a name="line.212"></a>
-<span class="sourceLineNo">213</span> (Class<? extends HMaster>) conf.getClass(HConstants.MASTER_IMPL, this.masterClass), index);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> this.masterThreads.add(mt);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return mt;<a name="line.215"></a>
+<span class="sourceLineNo">191</span> @SuppressWarnings("unchecked")<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.192"></a>
+<span class="sourceLineNo">193</span> Configuration config, final int index)<a name="line.193"></a>
+<span class="sourceLineNo">194</span> throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> // Create each regionserver with its own Configuration instance so each has<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // the guts of ConnectionManager).<a name="line.197"></a>
+<span class="sourceLineNo">198</span> JVMClusterUtil.RegionServerThread rst =<a name="line.198"></a>
+<span class="sourceLineNo">199</span> JVMClusterUtil.createRegionServerThread(config, (Class<? extends HRegionServer>) conf<a name="line.199"></a>
+<span class="sourceLineNo">200</span> .getClass(HConstants.REGION_SERVER_IMPL, this.regionServerClass), index);<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> this.regionThreads.add(rst);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return rst;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.206"></a>
+<span class="sourceLineNo">207</span> final Configuration config, final int index, User user)<a name="line.207"></a>
+<span class="sourceLineNo">208</span> throws IOException, InterruptedException {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return user.runAs(<a name="line.209"></a>
+<span class="sourceLineNo">210</span> new PrivilegedExceptionAction<JVMClusterUtil.RegionServerThread>() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public JVMClusterUtil.RegionServerThread run() throws Exception {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return addRegionServer(config, index);<a name="line.213"></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>
<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> public JVMClusterUtil.MasterThread addMaster(<a name="line.218"></a>
-<span class="sourceLineNo">219</span> final Configuration c, final int index, User user)<a name="line.219"></a>
-<span class="sourceLineNo">220</span> throws IOException, InterruptedException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return user.runAs(<a name="line.221"></a>
-<span class="sourceLineNo">222</span> new PrivilegedExceptionAction<JVMClusterUtil.MasterThread>() {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> @Override<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public JVMClusterUtil.MasterThread run() throws Exception {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> return addMaster(c, index);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> });<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> /**<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * @param serverNumber<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * @return region server<a name="line.232"></a>
-<span class="sourceLineNo">233</span> */<a name="line.233"></a>
-<span class="sourceLineNo">234</span> public HRegionServer getRegionServer(int serverNumber) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> return regionThreads.get(serverNumber).getRegionServer();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * @return Read-only list of region server threads.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> */<a name="line.240"></a>
-<span class="sourceLineNo">241</span> public List<JVMClusterUtil.RegionServerThread> getRegionServers() {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return Collections.unmodifiableList(this.regionThreads);<a name="line.242"></a>
+<span class="sourceLineNo">218</span> public JVMClusterUtil.MasterThread addMaster() throws IOException {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return addMaster(new Configuration(conf), this.masterThreads.size());<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public JVMClusterUtil.MasterThread addMaster(Configuration c, final int index)<a name="line.222"></a>
+<span class="sourceLineNo">223</span> throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // Create each master with its own Configuration instance so each has<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // the guts of ConnectionManager.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> JVMClusterUtil.MasterThread mt = JVMClusterUtil.createMasterThread(c,<a name="line.227"></a>
+<span class="sourceLineNo">228</span> (Class<? extends HMaster>) conf.getClass(HConstants.MASTER_IMPL, this.masterClass), index);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> this.masterThreads.add(mt);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> return mt;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> public JVMClusterUtil.MasterThread addMaster(<a name="line.233"></a>
+<span class="sourceLineNo">234</span> final Configuration c, final int index, User user)<a name="line.234"></a>
+<span class="sourceLineNo">235</span> throws IOException, InterruptedException {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> return user.runAs(<a name="line.236"></a>
+<span class="sourceLineNo">237</span> new PrivilegedExceptionAction<JVMClusterUtil.MasterThread>() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> @Override<a name="line.238"></a>
+<span class="sourceLineNo">239</span> public JVMClusterUtil.MasterThread run() throws Exception {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> return addMaster(c, index);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span> });<a name="line.242"></a>
<span class="sourceLineNo">243</span> }<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * @return List of running servers (Some servers may have been killed or<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * aborted during lifetime of cluster; these servers are not included in this<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * list).<a name="line.248"></a>
-<span class="sourceLineNo">249</span> */<a name="line.249"></a>
-<span class="sourceLineNo">250</span> public List<JVMClusterUtil.RegionServerThread> getLiveRegionServers() {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> List<JVMClusterUtil.RegionServerThread> liveServers = new ArrayList<>();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> List<RegionServerThread> list = getRegionServers();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> for (JVMClusterUtil.RegionServerThread rst: list) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> if (rst.isAlive()) liveServers.add(rst);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> else LOG.info("Not alive " + rst.getName());<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return liveServers;<a name="line.257"></a>
+<span class="sourceLineNo">246</span> * @param serverNumber<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * @return region server<a name="line.247"></a>
+<span class="sourceLineNo">248</span> */<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public HRegionServer getRegionServer(int serverNumber) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return regionThreads.get(serverNumber).getRegionServer();<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> /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @return Read-only list of region server threads.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public List<JVMClusterUtil.RegionServerThread> getRegionServers() {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return Collections.unmodifiableList(this.regionThreads);<a name="line.257"></a>
<span class="sourceLineNo">258</span> }<a name="line.258"></a>
<span class="sourceLineNo">259</span><a name="line.259"></a>
<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @return the Configuration used by this LocalHBaseCluster<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> public Configuration getConfiguration() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return this.conf;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> /**<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @return Name of region server that just went down.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> public String waitOnRegionServer(int serverNumber) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> JVMClusterUtil.RegionServerThread regionServerThread = this.regionThreads.get(serverNumber);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return waitOnRegionServer(regionServerThread);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span> /**<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @return Name of region server that just went down.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> */<a name="line.279"></a>
-<span class="sourceLineNo">280</span> public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> while (rst.isAlive()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> try {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> rst.join();<a name="line.284"></a>
-<span class="sourceLineNo">285</span> } catch (InterruptedException e) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> e.printStackTrace();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> regionThreads.remove(rst);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return rst.getName();<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @return the HMaster thread<a name="line.294"></a>
-<span class="sourceLineNo">295</span> */<a name="line.295"></a>
-<span class="sourceLineNo">296</span> public HMaster getMaster(int serverNumber) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return masterThreads.get(serverNumber).getMaster();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * Gets the current active master, if available. If no active master, returns<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * null.<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * @return the HMaster for the active master<a name="line.303"></a>
-<span class="sourceLineNo">304</span> */<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public HMaster getActiveMaster() {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // Ensure that the current active master is not stopped.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // We don't want to return a stopping master as an active master.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> if (mt.getMaster().isActiveMaster() && !mt.getMaster().isStopped()) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return mt.getMaster();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return null;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> /**<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @return Read-only list of master threads.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> */<a name="line.318"></a>
-<span class="sourceLineNo">319</span> public List<JVMClusterUtil.MasterThread> getMasters() {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> return Collections.unmodifiableList(this.masterThreads);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> /**<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @return List of running master servers (Some servers may have been killed<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * or aborted during lifetime of cluster; these servers are not included in<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * this list).<a name="line.326"></a>
-<span class="sourceLineNo">327</span> */<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public List<JVMClusterUtil.MasterThread> getLiveMasters() {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> List<JVMClusterUtil.MasterThread> liveServers = new ArrayList<>();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> List<JVMClusterUtil.MasterThread> list = getMasters();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for (JVMClusterUtil.MasterThread mt: list) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (mt.isAlive()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> liveServers.add(mt);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return liveServers;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> /**<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.340"></a>
-<span class="sourceLineNo">341</span> * @return Name of master that just went down.<a name="line.341"></a>
+<span class="sourceLineNo">261</span> * @return List of running servers (Some servers may have been killed or<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * aborted during lifetime of cluster; these servers are not included in this<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * list).<a name="line.263"></a>
+<span class="sourceLineNo">264</span> */<a name="line.264"></a>
+<span class="sourceLineNo">265</span> public List<JVMClusterUtil.RegionServerThread> getLiveRegionServers() {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> List<JVMClusterUtil.RegionServerThread> liveServers = new ArrayList<>();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> List<RegionServerThread> list = getRegionServers();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> for (JVMClusterUtil.RegionServerThread rst: list) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (rst.isAlive()) liveServers.add(rst);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> else LOG.info("Not alive " + rst.getName());<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return liveServers;<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>
+<span class="sourceLineNo">275</span> /**<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * @return the Configuration used by this LocalHBaseCluster<a name="line.276"></a>
+<span class="sourceLineNo">277</span> */<a name="line.277"></a>
+<span class="sourceLineNo">278</span> public Configuration getConfiguration() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return this.conf;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> /**<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @return Name of region server that just went down.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> */<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public String waitOnRegionServer(int serverNumber) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> JVMClusterUtil.RegionServerThread regionServerThread = this.regionThreads.get(serverNumber);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return waitOnRegionServer(regionServerThread);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * @return Name of region server that just went down.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> */<a name="line.294"></a>
+<span class="sourceLineNo">295</span> public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> while (rst.isAlive()) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> try {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> rst.join();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> } catch (InterruptedException e) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> e.printStackTrace();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> regionThreads.remove(rst);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return rst.getName();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @return the HMaster thread<a name="line.309"></a>
+<span class="sourceLineNo">310</span> */<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public HMaster getMaster(int serverNumber) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return masterThreads.get(serverNumber).getMaster();<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> /**<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * Gets the current active master, if available. If no active master, returns<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * null.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @return the HMaster for the active master<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public HMaster getActiveMaster() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> // Ensure that the current active master is not stopped.<a name="line.322"></a>
+<span class="sourceLineNo">323</span> // We don't want to return a stopping master as an active master.<a name="line.323"></a>
+<span class="sourceLineNo">324</span> if (mt.getMaster().isActiveMaster() && !mt.getMaster().isStopped()) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> return mt.getMaster();<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> return null;<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @return Read-only list of master threads.<a name="line.332"></a>
+<span class="sourceLineNo">333</span> */<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public List<JVMClusterUtil.MasterThread> getMasters() {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return Collections.unmodifiableList(this.masterThreads);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> /**<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * @return List of running master servers (Some servers may have been killed<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * or aborted during lifetime of cluster; these servers are not included in<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * this list).<a name="line.341"></a>
<span class="sourceLineNo">342</span> */<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public String waitOnMaster(int serverNumber) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> return waitOnMaster(masterThread);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @return Name of master that just went down.<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> while (masterThread.isAlive()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> try {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.355"></a>
-<span class="sourceLineNo">356</span> masterThread.join();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> } catch (InterruptedException e) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> e.printStackTrace();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> masterThreads.remove(masterThread);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return masterThread.getName();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<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> * Wait for Mini HBase Cluster to shut down.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * Presumes you've already called {@link #shutdown()}.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> */<a name="line.368"></a>
-<span class="sourceLineNo">369</span> public void join() {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> if (this.regionThreads != null) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> for(Thread t: this.regionThreads) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> if (t.isAlive()) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> try {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> Threads.threadDumpingIsAlive(t);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } catch (InterruptedException e) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> LOG.debug("Interrupted", e);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (this.masterThreads != null) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> for (Thread t : this.masterThreads) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (t.isAlive()) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> try {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> Threads.threadDumpingIsAlive(t);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> } catch (InterruptedException e) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> LOG.debug("Interrupted", e);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span> /**<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * Start the cluster.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> */<a name="line.396"></a>
-<span class="sourceLineNo">397</span> public void startup() throws IOException {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Shut down the mini HBase cluster<a name="line.402"></a>
-<span class="sourceLineNo">403</span> */<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public void shutdown() {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> /**<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * @param c Configuration to check.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * @return True if a 'local' address in hbase.master value.<a name="line.410"></a>
+<span class="sourceLineNo">343</span> public List<JVMClusterUtil.MasterThread> getLiveMasters() {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> List<JVMClusterUtil.MasterThread> liveServers = new ArrayList<>();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> List<JVMClusterUtil.MasterThread> list = getMasters();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> for (JVMClusterUtil.MasterThread mt: list) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (mt.isAlive()) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> liveServers.add(mt);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return liveServers;<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> /**<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return Name of master that just went down.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public String waitOnMaster(int serverNumber) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> return waitOnMaster(masterThread);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @return Name of master that just went down.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> */<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> while (masterThread.isAlive()) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> try {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.370"></a>
+<span class="sourceLineNo">371</span> masterThread.join();<a name="line.371"></a>
+<span class="sourceLineNo">372</span> } catch (InterruptedException e) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> e.printStackTrace();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> }<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> masterThreads.remove(masterThread);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return masterThread.getName();<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * Wait for Mini HBase Cluster to shut down.<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * Presumes you've already called {@link #shutdown()}.<a name="line.382"></a>
+<span class="sourceLineNo">383</span> */<a name="line.383"></a>
+<span class="sourceLineNo">384</span> public void join() {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (this.regionThreads != null) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> for(Thread t: this.regionThreads) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (t.isAlive()) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> try {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> Threads.threadDumpingIsAlive(t);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> } catch (InterruptedException e) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> LOG.debug("Interrupted", e);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (this.masterThreads != null) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> for (Thread t : this.masterThreads) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (t.isAlive()) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> try {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> Threads.threadDumpingIsAlive(t);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> } catch (InterruptedException e) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> LOG.debug("Interrupted", e);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> }<a name="line.406"></a>
+<span class="sourceLineNo">407</span> }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span> /**<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * Start the cluster.<a name="line.410"></a>
<span class="sourceLineNo">411</span> */<a name="line.411"></a>
-<span class="sourceLineNo">412</span> public static boolean isLocal(final Configuration c) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Test things basically work.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * @param args<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * @throws IOException<a name="line.420"></a>
-<span class="sourceLineNo">421</span> */<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public static void main(String[] args) throws IOException {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> Configuration conf = HBaseConfiguration.create();<a name="line.423"></a>
-<span class="sourceLineNo">424</span> LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> cluster.startup();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Connection connection = ConnectionFactory.createConnection(conf);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> Admin admin = connection.getAdmin();<a name="line.427"></a>
-<span class="sourceLineNo">428</span> try {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> HTableDescriptor htd =<a name="line.429"></a>
-<span class="sourceLineNo">430</span> new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.430"></a>
-<span class="sourceLineNo">431</span> admin.createTable(htd);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> } finally {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> admin.close();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> connection.close();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> cluster.shutdown();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>}<a name="line.438"></a>
+<span class="sourceLineNo">412</span> public void startup() throws IOException {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * Shut down the mini HBase cluster<a name="line.417"></a>
+<span class="sourceLineNo">418</span> */<a name="line.418"></a>
+<span class="sourceLineNo">419</span> public void shutdown() {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * @param c Configuration to check.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @return True if a 'local' address in hbase.master value.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public static boolean isLocal(final Configuration c) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> /**<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * Test things basically work.<a name="line.433"></a>
+<span class="sourceLineNo">434</span> * @param args<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * @throws IOException<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> public static void main(String[] args) throws IOException {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> Configuration conf = HBaseConfiguration.create();<a name="line.438"></a>
+<span class="sourceLineNo">439</span> LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> cluster.startup();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> Connection connection = ConnectionFactory.createConnection(conf);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Admin admin = connection.getAdmin();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> try {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> HTableDescriptor htd =<a name="line.444"></a>
+<span class="sourceLineNo">445</span> new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.445"></a>
+<span class="sourceLineNo">446</span> admin.createTable(htd);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> } finally {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> admin.close();<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span> connection.close();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> cluster.shutdown();<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>}<a name="line.453"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 15fcfae..2b91e84 100644
--- a/book.html
+++ b/book.html
@@ -37873,7 +37873,7 @@ The server will return cellblocks compressed using this same compressor as long
<div id="footer">
<div id="footer-text">
Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-05-09 15:13:57 UTC
+Last updated 2018-05-10 14:29:49 UTC
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index 3c9604a..8d3a4bb 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Bulk Loads in Apache HBase (TM)
@@ -306,7 +306,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
[12/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
index 04ed218..18b03b0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
@@ -2108,7 +2108,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>fam1</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1687">fam1</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1677">fam1</a></pre>
</li>
</ul>
<a name="fam2">
@@ -2117,7 +2117,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>fam2</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1688">fam2</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1678">fam2</a></pre>
</li>
</ul>
<a name="fam3">
@@ -2126,7 +2126,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>fam3</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1689">fam3</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1679">fam3</a></pre>
</li>
</ul>
<a name="COLUMNS">
@@ -2135,7 +2135,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>COLUMNS</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1690">COLUMNS</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1680">COLUMNS</a></pre>
</li>
</ul>
<a name="MAXVERSIONS">
@@ -2144,7 +2144,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>MAXVERSIONS</h4>
-<pre>private static final int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1691">MAXVERSIONS</a></pre>
+<pre>private static final int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1681">MAXVERSIONS</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.MAXVERSIONS">Constant Field Values</a></dd>
@@ -2157,7 +2157,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>FIRST_CHAR</h4>
-<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1693">FIRST_CHAR</a></pre>
+<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1683">FIRST_CHAR</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.FIRST_CHAR">Constant Field Values</a></dd>
@@ -2170,7 +2170,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>LAST_CHAR</h4>
-<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1694">LAST_CHAR</a></pre>
+<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1684">LAST_CHAR</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.LAST_CHAR">Constant Field Values</a></dd>
@@ -2183,7 +2183,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>START_KEY_BYTES</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1695">START_KEY_BYTES</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1685">START_KEY_BYTES</a></pre>
</li>
</ul>
<a name="START_KEY">
@@ -2192,7 +2192,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>START_KEY</h4>
-<pre>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1696">START_KEY</a></pre>
+<pre>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1686">START_KEY</a></pre>
</li>
</ul>
<a name="ROWS">
@@ -2201,7 +2201,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>ROWS</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2249">ROWS</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2239">ROWS</a></pre>
<div class="block">All the row values for the data loaded by <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#loadTable-org.apache.hadoop.hbase.client.Table-byte:A-"><code>loadTable(Table, byte[])</code></a></div>
</li>
</ul>
@@ -2211,7 +2211,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>KEYS</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2264">KEYS</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2254">KEYS</a></pre>
</li>
</ul>
<a name="KEYS_FOR_HBA_CREATE_TABLE">
@@ -2220,7 +2220,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>KEYS_FOR_HBA_CREATE_TABLE</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2276">KEYS_FOR_HBA_CREATE_TABLE</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2266">KEYS_FOR_HBA_CREATE_TABLE</a></pre>
</li>
</ul>
<a name="hbaseAdmin">
@@ -2229,7 +2229,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>hbaseAdmin</h4>
-<pre>private org.apache.hadoop.hbase.client.HBaseAdmin <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2812">hbaseAdmin</a></pre>
+<pre>private org.apache.hadoop.hbase.client.HBaseAdmin <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2802">hbaseAdmin</a></pre>
</li>
</ul>
<a name="random">
@@ -2238,7 +2238,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockList">
<li class="blockList">
<h4>random</h4>
-<pre>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.3554">random</a></pre>
+<pre>private static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.3544">random</a></pre>
</li>
</ul>
<a name="portAllocator">
@@ -2247,7 +2247,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<ul class="blockListLast">
<li class="blockList">
<h4>portAllocator</h4>
-<pre>private static final <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility.PortAllocator</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.3556">portAllocator</a></pre>
+<pre>private static final <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility.PortAllocator</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.3546">portAllocator</a></pre>
</li>
</ul>
</li>
@@ -2362,7 +2362,7 @@ private static final <a href="https://docs.oracle.com/javase/8/docs/api/jav
<li class="blockList">
<h4>createLocalHTU</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.367">createLocalHTU</a>()</pre>
+public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.357">createLocalHTU</a>()</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">use <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#HBaseTestingUtility--"><code>HBaseTestingUtility()</code></a> instead</span></div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -2377,7 +2377,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<li class="blockList">
<h4>createLocalHTU</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.376">createLocalHTU</a>(org.apache.hadoop.conf.Configuration c)</pre>
+public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.366">createLocalHTU</a>(org.apache.hadoop.conf.Configuration c)</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">use <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#HBaseTestingUtility-org.apache.hadoop.conf.Configuration-"><code>HBaseTestingUtility(Configuration)</code></a> instead</span></div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -2391,7 +2391,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>closeRegionAndWAL</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.383">closeRegionAndWAL</a>(org.apache.hadoop.hbase.regionserver.Region r)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.373">closeRegionAndWAL</a>(org.apache.hadoop.hbase.regionserver.Region r)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Close both the region <code>r</code> and it's underlying WAL. For use in tests.</div>
<dl>
@@ -2406,7 +2406,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>closeRegionAndWAL</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.390">closeRegionAndWAL</a>(org.apache.hadoop.hbase.regionserver.HRegion r)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.380">closeRegionAndWAL</a>(org.apache.hadoop.hbase.regionserver.HRegion r)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Close both the HRegion <code>r</code> and it's underlying WAL. For use in tests.</div>
<dl>
@@ -2421,7 +2421,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>getConfiguration</h4>
-<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.409">getConfiguration</a>()</pre>
+<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.399">getConfiguration</a>()</pre>
<div class="block">Returns this classes's instance of <code>Configuration</code>. Be careful how
you use the returned Configuration since <code>Connection</code> instances
can be shared. The Map of Connections is keyed by the Configuration. If
@@ -2444,7 +2444,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>setHBaseCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.413">setHBaseCluster</a>(<a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="class in org.apache.hadoop.hbase">HBaseCluster</a> hbaseCluster)</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.403">setHBaseCluster</a>(<a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="class in org.apache.hadoop.hbase">HBaseCluster</a> hbaseCluster)</pre>
</li>
</ul>
<a name="setupDataTestDir--">
@@ -2453,7 +2453,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>setupDataTestDir</h4>
-<pre>protected org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.434">setupDataTestDir</a>()</pre>
+<pre>protected org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.424">setupDataTestDir</a>()</pre>
<div class="block">Home our data in a dir under <a href="../../../../org/apache/hadoop/hbase/HBaseCommonTestingUtility.html#DEFAULT_BASE_TEST_DIRECTORY"><code>HBaseCommonTestingUtility.DEFAULT_BASE_TEST_DIRECTORY</code></a>.
Give it a random name so can have many concurrent tests running if
we need to. It needs to amend the <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#TEST_DIRECTORY_KEY"><code>TEST_DIRECTORY_KEY</code></a>
@@ -2480,7 +2480,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>createSubDirAndSystemProperty</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.458">createSubDirAndSystemProperty</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> propertyName,
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.448">createSubDirAndSystemProperty</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> propertyName,
org.apache.hadoop.fs.Path parent,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subDirName)</pre>
</li>
@@ -2491,7 +2491,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>getBaseTestDirOnTestFS</h4>
-<pre>private org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.490">getBaseTestDirOnTestFS</a>()
+<pre>private org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.480">getBaseTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -2512,7 +2512,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<li class="blockList">
<h4>getMetaTableDescriptor</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.501">getMetaTableDescriptor</a>()</pre>
+public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.491">getMetaTableDescriptor</a>()</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 2.0 version and will be removed in 3.0 version.
use <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getMetaTableDescriptorBuilder--"><code>getMetaTableDescriptorBuilder()</code></a></span></div>
<dl>
@@ -2527,7 +2527,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getMetaTableDescriptorBuilder</h4>
-<pre>public org.apache.hadoop.hbase.client.TableDescriptorBuilder <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.508">getMetaTableDescriptorBuilder</a>()</pre>
+<pre>public org.apache.hadoop.hbase.client.TableDescriptorBuilder <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.498">getMetaTableDescriptorBuilder</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>META table descriptor</dd>
@@ -2540,7 +2540,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getDataTestDirOnTestFS</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.522">getDataTestDirOnTestFS</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.512">getDataTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns a Path in the test filesystem, obtained from <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getTestFileSystem--"><code>getTestFileSystem()</code></a>
to write temporary test data. Call this method after setting up the mini dfs cluster
@@ -2559,7 +2559,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getDataTestDirOnTestFS</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.537">getDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.527">getDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns a Path in the test filesystem, obtained from <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getTestFileSystem--"><code>getTestFileSystem()</code></a>
to write temporary test data. Call this method after setting up the mini dfs cluster
@@ -2580,7 +2580,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>setupDataTestDirOnTestFS</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.545">setupDataTestDirOnTestFS</a>()
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.535">setupDataTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Sets up a path in test filesystem to be used by tests.
Creates a new directory if not already setup.</div>
@@ -2596,7 +2596,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getNewDataTestDirOnTestFS</h4>
-<pre>private org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.557">getNewDataTestDirOnTestFS</a>()
+<pre>private org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.547">getNewDataTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Sets up a new path in test filesystem to be used by tests.</div>
<dl>
@@ -2611,7 +2611,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>cleanupDataTestDirOnTestFS</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.582">cleanupDataTestDirOnTestFS</a>()
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.572">cleanupDataTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Cleans the test data directory on the test filesystem.</div>
<dl>
@@ -2628,7 +2628,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>cleanupDataTestDirOnTestFS</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.594">cleanupDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.584">cleanupDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Cleans a subdirectory under the test data directory on the test filesystem.</div>
<dl>
@@ -2645,7 +2645,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.606">startMiniDFSCluster</a>(int servers)
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.596">startMiniDFSCluster</a>(int servers)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start a minidfscluster.</div>
<dl>
@@ -2666,7 +2666,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.621">startMiniDFSCluster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.611">startMiniDFSCluster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start a minidfscluster.
This is useful if you want to run datanode on distinct hosts for things
@@ -2691,7 +2691,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.639">startMiniDFSCluster</a>(int servers,
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.629">startMiniDFSCluster</a>(int servers,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start a minidfscluster.
@@ -2715,7 +2715,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>setFs</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.644">setFs</a>()
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.634">setFs</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -2729,7 +2729,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.656">startMiniDFSCluster</a>(int servers,
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.646">startMiniDFSCluster</a>(int servers,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] racks,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2745,7 +2745,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSClusterForTestWAL</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.687">startMiniDFSClusterForTestWAL</a>(int namenodePort)
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.677">startMiniDFSClusterForTestWAL</a>(int namenodePort)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -2759,7 +2759,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createDirsAndSetProperties</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.695">createDirsAndSetProperties</a>()
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.685">createDirsAndSetProperties</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">This is used before starting HDFS and map-reduce mini-clusters</div>
<dl>
@@ -2774,7 +2774,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>isReadShortCircuitOn</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.723">isReadShortCircuitOn</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.713">isReadShortCircuitOn</a>()</pre>
<div class="block">Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.
This allows to specify this parameter on the command line.
If not set, default is true.</div>
@@ -2786,7 +2786,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>enableShortCircuit</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.736">enableShortCircuit</a>()</pre>
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.726">enableShortCircuit</a>()</pre>
<div class="block">Enable the short circuit read, unless configured differently.
Set both HBase and HDFS settings, including skipping the hdfs checksum checks.</div>
</li>
@@ -2797,7 +2797,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createDirAndSetProperty</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.751">createDirAndSetProperty</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> relPath,
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.741">createDirAndSetProperty</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> relPath,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> property)</pre>
</li>
</ul>
@@ -2807,7 +2807,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>shutdownMiniDFSCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.765">shutdownMiniDFSCluster</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.755">shutdownMiniDFSCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Shuts down instance created by call to <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#startMiniDFSCluster-int-"><code>startMiniDFSCluster(int)</code></a>
or does nothing.</div>
@@ -2823,7 +2823,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.782">startMiniCluster</a>()
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.772">startMiniCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, dfs, and zookeeper.</div>
<dl>
@@ -2842,7 +2842,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.792">startMiniCluster</a>(boolean withWALDir)
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.782">startMiniCluster</a>(boolean withWALDir)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.</div>
<dl>
@@ -2861,7 +2861,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.804">startMiniCluster</a>(int numSlaves,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.794">startMiniCluster</a>(int numSlaves,
boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, dfs, and zookeeper.
@@ -2883,7 +2883,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.822">startMiniCluster</a>(int numSlaves)
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.812">startMiniCluster</a>(int numSlaves)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, optionally dfs, and zookeeper.
Modifies Configuration. Homes the cluster data directory under a random
@@ -2910,7 +2910,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.827">startMiniCluster</a>(int numSlaves,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.817">startMiniCluster</a>(int numSlaves,
boolean create,
boolean withWALDir)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2926,7 +2926,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.839">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.829">startMiniCluster</a>(int numMasters,
int numSlaves,
boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2948,7 +2948,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.851">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.841">startMiniCluster</a>(int numMasters,
int numSlaves)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">start minicluster</div>
@@ -2968,7 +2968,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.857">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.847">startMiniCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
boolean create)
@@ -2985,7 +2985,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.888">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.878">startMiniCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -3025,7 +3025,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.898">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.888">startMiniCluster</a>(int numMasters,
int numSlaves,
int numDataNodes)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -3044,7 +3044,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.930">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.920">startMiniCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends org.apache.hadoop.hbase.master.HMaster> masterClass,
@@ -3089,7 +3089,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.938">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.928">startMiniCluster</a>(int numMasters,
int numSlaves,
int numDataNodes,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
@@ -3108,7 +3108,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.954">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.944">startMiniCluster</a>(int numMasters,
int numSlaves,
int numDataNodes,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
@@ -3135,7 +3135,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.993">startMiniHBaseCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.983">startMiniHBaseCluster</a>(int numMasters,
int numSlaves)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
@@ -3152,7 +3152,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.998">startMiniHBaseCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.988">startMiniHBaseCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> rsPorts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -3170,7 +3170,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>startMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1018">startMiniHBaseCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1008">startMiniHBaseCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> rsPorts,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends org.apache.hadoop.hbase.master.HMaster> masterClass,
@@ -3206,7 +3206,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>restartHBaseCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1066">restartHBaseCluster</a>(int servers)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1056">restartHBaseCluster</a>(int servers)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<div class="block">Starts the hbase cluster up again after shutting it down previously in a
@@ -3226,7 +3226,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1090">getMiniHBaseCluster</a>()</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1080">getMiniHBaseCluster</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Current mini hbase cluster. Only has something in it after a call
@@ -3242,7 +3242,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>shutdownMiniCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1103">shutdownMiniCluster</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1093">shutdownMiniCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Stops mini hbase, zk, and hdfs clusters.</div>
<dl>
@@ -3260,7 +3260,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>shutdownMiniHBaseCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1122">shutdownMiniHBaseCluster</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1112">shutdownMiniHBaseCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Shutdown HBase mini cluster. Does not shutdown zk or dfs if running.</div>
<dl>
@@ -3275,7 +3275,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getDefaultRootDirPath</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1152">getDefaultRootDirPath</a>(boolean create)
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1142">getDefaultRootDirPath</a>(boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns the path to the default root dir the minicluster uses. If <code>create</code>
is true, a new root directory path is fetched irrespective of whether it has been fetched
@@ -3295,7 +3295,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>getDefaultRootDirPath</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1167">getDefaultRootDirPath</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1157">getDefaultRootDirPath</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Same as {<a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getDefaultRootDirPath-boolean-"><code>getDefaultRootDirPath(boolean create)</code></a>
except that <code>create</code> flag is false.
@@ -3314,7 +3314,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createRootDir</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1183">createRootDir</a>(boolean create)
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1173">createRootDir</a>(boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Creates an hbase rootdir in user home directory. Also creates hbase
version file. Normally you won't make use of this method. Root hbasedir
@@ -3339,7 +3339,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createRootDir</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1198">createRootDir</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1188">createRootDir</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#createRootDir-boolean-"><code>createRootDir(boolean create)</code></a>
except that <code>create</code> flag is false.</div>
@@ -3357,7 +3357,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createWALRootDir</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1211">createWALRootDir</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1201">createWALRootDir</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Creates a hbase walDir in the user's home directory.
Normally you won't make use of this method. Root hbaseWALDir
@@ -3377,7 +3377,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>setHBaseFsTmpDir</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1219">setHBaseFsTmpDir</a>()
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1209">setHBaseFsTmpDir</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -3391,7 +3391,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>flush</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1233">flush</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1223">flush</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Flushes all caches in the mini hbase cluster</div>
<dl>
@@ -3406,7 +3406,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>flush</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1241">flush</a>(org.apache.hadoop.hbase.TableName tableName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1231">flush</a>(org.apache.hadoop.hbase.TableName tableName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Flushes all caches in the mini hbase cluster</div>
<dl>
@@ -3421,7 +3421,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1249">compact</a>(boolean major)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1239">compact</a>(boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Compact all regions in the mini hbase cluster</div>
<dl>
@@ -3436,7 +3436,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1257">compact</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1247">compact</a>(org.apache.hadoop.hbase.TableName tableName,
boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Compact all of a table's reagion in the mini hbase cluster</div>
@@ -3452,7 +3452,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1268">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1258">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> family)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3473,7 +3473,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1280">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1270">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] families)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3494,7 +3494,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1296">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1286">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[] family)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3515,7 +3515,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1309">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1299">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[] family,
int numRegions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3538,7 +3538,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1326">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1316">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3559,7 +3559,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1338">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1328">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table with multiple regions.</div>
@@ -3580,7 +3580,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1350">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1340">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
byte[][] splitKeys)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3603,7 +3603,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1355">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1345">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int numVersions,
byte[] startKey,
@@ -3622,7 +3622,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1375">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1365">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
byte[][] families,
org.apache.hadoop.conf.Configuration c)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3645,7 +3645,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1389">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1379">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
byte[][] families,
byte[][] splitKeys,
org.apache.hadoop.conf.Configuration c)
@@ -3670,7 +3670,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1409">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1399">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
byte[][] families,
byte[][] splitKeys,
org.apache.hadoop.hbase.regionserver.BloomType type,
@@ -3699,7 +3699,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1432">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1422">createTable</a>(org.apache.hadoop.hbase.client.TableDescriptor htd,
byte[][] splitRows)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3720,7 +3720,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1450">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1440">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
byte[][] splitKeys,
org.apache.hadoop.conf.Configuration c)
@@ -3745,7 +3745,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1463">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1453">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[] family,
int numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3768,7 +3768,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1476">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1466">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3791,7 +3791,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1490">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1480">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int numVersions,
byte[][] splitKeys)
@@ -3816,7 +3816,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1512">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1502">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3839,7 +3839,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1526">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1516">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int numVersions,
int blockSize)
@@ -3864,7 +3864,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1542">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1532">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int numVersions,
int blockSize,
@@ -3882,7 +3882,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1569">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1559">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[][] families,
int[] numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3905,7 +3905,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1595">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1585">createTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[] family,
byte[][] splitRows)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3928,7 +3928,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1614">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public org.apache.hadoop.hbase.client.Table <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1604">createMultiRegionTable</a>(org.apache.hadoop.hbase.TableName tableName,
byte[] family)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table with multiple regions.</div>
@@ -3949,7 +3949,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>modifyTableSync</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1622">modifyTableSync</a>(org.apache.hadoop.hbase.client.Admin admin,
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1612">modifyTableSync</a>(org.apache.hadoop.hbase.client.Admin admin,
org.apache.hadoop.hbase.client.TableDescriptor desc)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
@@ -3967,7 +3967,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>setReplicas</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1649">setReplicas</a>(org.apache.hadoop.hbase.client.Admin admin,
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1639">setReplicas</a>(org.apache.hadoop.hbase.client.Admin admin,
org.apache.hadoop.hbase.TableName table,
int replicaCount)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -3986,7 +3986,7 @@ public org.apache.hadoop.hbase.HTableDescriptor <a href="../../../../s
<ul class="blockList">
<li class="blockList">
<h4>deleteTable</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1662">deleteTable</a>(org.apache.hadoop.hbase.TableName tableName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1652">deleteTable</a>(org.apache.hadoop.hbase.TableName tableName)
<TRUNCATED>
[30/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html b/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 1d2d704..9aa09f0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -147,303 +147,318 @@
<span class="sourceLineNo">139</span> throws IOException {<a name="line.139"></a>
<span class="sourceLineNo">140</span> this.conf = conf;<a name="line.140"></a>
<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // Always have masters and regionservers come up on port '0' so we don't<a name="line.142"></a>
-<span class="sourceLineNo">143</span> // clash over default ports.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> if (conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.145"></a>
-<span class="sourceLineNo">146</span> conf.set(HConstants.REGIONSERVER_PORT, "0");<a name="line.146"></a>
-<span class="sourceLineNo">147</span> if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> conf.set(HConstants.MASTER_INFO_PORT, "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> this.masterClass = (Class<? extends HMaster>)<a name="line.155"></a>
-<span class="sourceLineNo">156</span> conf.getClass(HConstants.MASTER_IMPL, masterClass);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // Start the HMasters.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> for (int i = 0; i < noMasters; i++) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> addMaster(new Configuration(conf), i);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span> // Start the HRegionServers.<a name="line.161"></a>
-<span class="sourceLineNo">162</span> this.regionServerClass =<a name="line.162"></a>
-<span class="sourceLineNo">163</span> (Class<? extends HRegionServer>)conf.getClass(HConstants.REGION_SERVER_IMPL,<a name="line.163"></a>
-<span class="sourceLineNo">164</span> regionServerClass);<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> for (int i = 0; i < noRegionServers; i++) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> addRegionServer(new Configuration(conf), i);<a name="line.167"></a>
+<span class="sourceLineNo">142</span> // When active, if a port selection is default then we switch to random<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (conf.getBoolean(ASSIGN_RANDOM_PORTS, false)) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> if (conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT)<a name="line.144"></a>
+<span class="sourceLineNo">145</span> == HConstants.DEFAULT_MASTER_PORT) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> LOG.debug("Setting Master Port to random.");<a name="line.146"></a>
+<span class="sourceLineNo">147</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> LOG.debug("Setting RegionServer Port to random.");<a name="line.151"></a>
+<span class="sourceLineNo">152</span> conf.set(HConstants.REGIONSERVER_PORT, "0");<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> // treat info ports special; expressly don't change '-1' (keep off)<a name="line.154"></a>
+<span class="sourceLineNo">155</span> // in case we make that the default behavior.<a name="line.155"></a>
+<span class="sourceLineNo">156</span> if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1 &&<a name="line.156"></a>
+<span class="sourceLineNo">157</span> conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT)<a name="line.157"></a>
+<span class="sourceLineNo">158</span> == HConstants.DEFAULT_REGIONSERVER_INFOPORT) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> LOG.debug("Setting RS InfoServer Port to random.");<a name="line.159"></a>
+<span class="sourceLineNo">160</span> conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1 &&<a name="line.162"></a>
+<span class="sourceLineNo">163</span> conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.163"></a>
+<span class="sourceLineNo">164</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> LOG.debug("Setting Master InfoServer Port to random.");<a name="line.165"></a>
+<span class="sourceLineNo">166</span> conf.set(HConstants.MASTER_INFO_PORT, "0");<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> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> public JVMClusterUtil.RegionServerThread addRegionServer()<a name="line.171"></a>
-<span class="sourceLineNo">172</span> throws IOException {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> return addRegionServer(new Configuration(conf), this.regionThreads.size());<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> @SuppressWarnings("unchecked")<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.177"></a>
-<span class="sourceLineNo">178</span> Configuration config, final int index)<a name="line.178"></a>
-<span class="sourceLineNo">179</span> throws IOException {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Create each regionserver with its own Configuration instance so each has<a name="line.180"></a>
-<span class="sourceLineNo">181</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // the guts of ConnectionManager).<a name="line.182"></a>
-<span class="sourceLineNo">183</span> JVMClusterUtil.RegionServerThread rst =<a name="line.183"></a>
-<span class="sourceLineNo">184</span> JVMClusterUtil.createRegionServerThread(config, (Class<? extends HRegionServer>) conf<a name="line.184"></a>
-<span class="sourceLineNo">185</span> .getClass(HConstants.REGION_SERVER_IMPL, this.regionServerClass), index);<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> this.regionThreads.add(rst);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return rst;<a name="line.188"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> this.masterClass = (Class<? extends HMaster>)<a name="line.170"></a>
+<span class="sourceLineNo">171</span> conf.getClass(HConstants.MASTER_IMPL, masterClass);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // Start the HMasters.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> for (int i = 0; i < noMasters; i++) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> addMaster(new Configuration(conf), i);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // Start the HRegionServers.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> this.regionServerClass =<a name="line.177"></a>
+<span class="sourceLineNo">178</span> (Class<? extends HRegionServer>)conf.getClass(HConstants.REGION_SERVER_IMPL,<a name="line.178"></a>
+<span class="sourceLineNo">179</span> regionServerClass);<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> for (int i = 0; i < noRegionServers; i++) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> addRegionServer(new Configuration(conf), i);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> public JVMClusterUtil.RegionServerThread addRegionServer()<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throws IOException {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return addRegionServer(new Configuration(conf), this.regionThreads.size());<a name="line.188"></a>
<span class="sourceLineNo">189</span> }<a name="line.189"></a>
<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.191"></a>
-<span class="sourceLineNo">192</span> final Configuration config, final int index, User user)<a name="line.192"></a>
-<span class="sourceLineNo">193</span> throws IOException, InterruptedException {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> return user.runAs(<a name="line.194"></a>
-<span class="sourceLineNo">195</span> new PrivilegedExceptionAction<JVMClusterUtil.RegionServerThread>() {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> @Override<a name="line.196"></a>
-<span class="sourceLineNo">197</span> public JVMClusterUtil.RegionServerThread run() throws Exception {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return addRegionServer(config, index);<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><a name="line.202"></a>
-<span class="sourceLineNo">203</span> public JVMClusterUtil.MasterThread addMaster() throws IOException {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return addMaster(new Configuration(conf), this.masterThreads.size());<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> public JVMClusterUtil.MasterThread addMaster(Configuration c, final int index)<a name="line.207"></a>
-<span class="sourceLineNo">208</span> throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // Create each master with its own Configuration instance so each has<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.210"></a>
-<span class="sourceLineNo">211</span> // the guts of ConnectionManager.<a name="line.211"></a>
-<span class="sourceLineNo">212</span> JVMClusterUtil.MasterThread mt = JVMClusterUtil.createMasterThread(c,<a name="line.212"></a>
-<span class="sourceLineNo">213</span> (Class<? extends HMaster>) conf.getClass(HConstants.MASTER_IMPL, this.masterClass), index);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> this.masterThreads.add(mt);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return mt;<a name="line.215"></a>
+<span class="sourceLineNo">191</span> @SuppressWarnings("unchecked")<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.192"></a>
+<span class="sourceLineNo">193</span> Configuration config, final int index)<a name="line.193"></a>
+<span class="sourceLineNo">194</span> throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> // Create each regionserver with its own Configuration instance so each has<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // the guts of ConnectionManager).<a name="line.197"></a>
+<span class="sourceLineNo">198</span> JVMClusterUtil.RegionServerThread rst =<a name="line.198"></a>
+<span class="sourceLineNo">199</span> JVMClusterUtil.createRegionServerThread(config, (Class<? extends HRegionServer>) conf<a name="line.199"></a>
+<span class="sourceLineNo">200</span> .getClass(HConstants.REGION_SERVER_IMPL, this.regionServerClass), index);<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> this.regionThreads.add(rst);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return rst;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public JVMClusterUtil.RegionServerThread addRegionServer(<a name="line.206"></a>
+<span class="sourceLineNo">207</span> final Configuration config, final int index, User user)<a name="line.207"></a>
+<span class="sourceLineNo">208</span> throws IOException, InterruptedException {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return user.runAs(<a name="line.209"></a>
+<span class="sourceLineNo">210</span> new PrivilegedExceptionAction<JVMClusterUtil.RegionServerThread>() {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public JVMClusterUtil.RegionServerThread run() throws Exception {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return addRegionServer(config, index);<a name="line.213"></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>
<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> public JVMClusterUtil.MasterThread addMaster(<a name="line.218"></a>
-<span class="sourceLineNo">219</span> final Configuration c, final int index, User user)<a name="line.219"></a>
-<span class="sourceLineNo">220</span> throws IOException, InterruptedException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> return user.runAs(<a name="line.221"></a>
-<span class="sourceLineNo">222</span> new PrivilegedExceptionAction<JVMClusterUtil.MasterThread>() {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> @Override<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public JVMClusterUtil.MasterThread run() throws Exception {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> return addMaster(c, index);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> });<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> /**<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * @param serverNumber<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * @return region server<a name="line.232"></a>
-<span class="sourceLineNo">233</span> */<a name="line.233"></a>
-<span class="sourceLineNo">234</span> public HRegionServer getRegionServer(int serverNumber) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> return regionThreads.get(serverNumber).getRegionServer();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * @return Read-only list of region server threads.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> */<a name="line.240"></a>
-<span class="sourceLineNo">241</span> public List<JVMClusterUtil.RegionServerThread> getRegionServers() {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> return Collections.unmodifiableList(this.regionThreads);<a name="line.242"></a>
+<span class="sourceLineNo">218</span> public JVMClusterUtil.MasterThread addMaster() throws IOException {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return addMaster(new Configuration(conf), this.masterThreads.size());<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> public JVMClusterUtil.MasterThread addMaster(Configuration c, final int index)<a name="line.222"></a>
+<span class="sourceLineNo">223</span> throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // Create each master with its own Configuration instance so each has<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // its Connection instance rather than share (see HBASE_INSTANCES down in<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // the guts of ConnectionManager.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> JVMClusterUtil.MasterThread mt = JVMClusterUtil.createMasterThread(c,<a name="line.227"></a>
+<span class="sourceLineNo">228</span> (Class<? extends HMaster>) conf.getClass(HConstants.MASTER_IMPL, this.masterClass), index);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> this.masterThreads.add(mt);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> return mt;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> public JVMClusterUtil.MasterThread addMaster(<a name="line.233"></a>
+<span class="sourceLineNo">234</span> final Configuration c, final int index, User user)<a name="line.234"></a>
+<span class="sourceLineNo">235</span> throws IOException, InterruptedException {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> return user.runAs(<a name="line.236"></a>
+<span class="sourceLineNo">237</span> new PrivilegedExceptionAction<JVMClusterUtil.MasterThread>() {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> @Override<a name="line.238"></a>
+<span class="sourceLineNo">239</span> public JVMClusterUtil.MasterThread run() throws Exception {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> return addMaster(c, index);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span> });<a name="line.242"></a>
<span class="sourceLineNo">243</span> }<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * @return List of running servers (Some servers may have been killed or<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * aborted during lifetime of cluster; these servers are not included in this<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * list).<a name="line.248"></a>
-<span class="sourceLineNo">249</span> */<a name="line.249"></a>
-<span class="sourceLineNo">250</span> public List<JVMClusterUtil.RegionServerThread> getLiveRegionServers() {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> List<JVMClusterUtil.RegionServerThread> liveServers = new ArrayList<>();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> List<RegionServerThread> list = getRegionServers();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> for (JVMClusterUtil.RegionServerThread rst: list) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> if (rst.isAlive()) liveServers.add(rst);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> else LOG.info("Not alive " + rst.getName());<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return liveServers;<a name="line.257"></a>
+<span class="sourceLineNo">246</span> * @param serverNumber<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * @return region server<a name="line.247"></a>
+<span class="sourceLineNo">248</span> */<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public HRegionServer getRegionServer(int serverNumber) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return regionThreads.get(serverNumber).getRegionServer();<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> /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @return Read-only list of region server threads.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public List<JVMClusterUtil.RegionServerThread> getRegionServers() {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return Collections.unmodifiableList(this.regionThreads);<a name="line.257"></a>
<span class="sourceLineNo">258</span> }<a name="line.258"></a>
<span class="sourceLineNo">259</span><a name="line.259"></a>
<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @return the Configuration used by this LocalHBaseCluster<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> public Configuration getConfiguration() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return this.conf;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> /**<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @return Name of region server that just went down.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> public String waitOnRegionServer(int serverNumber) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> JVMClusterUtil.RegionServerThread regionServerThread = this.regionThreads.get(serverNumber);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return waitOnRegionServer(regionServerThread);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span> /**<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @return Name of region server that just went down.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> */<a name="line.279"></a>
-<span class="sourceLineNo">280</span> public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> while (rst.isAlive()) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> try {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> rst.join();<a name="line.284"></a>
-<span class="sourceLineNo">285</span> } catch (InterruptedException e) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> e.printStackTrace();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> regionThreads.remove(rst);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return rst.getName();<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> /**<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * @return the HMaster thread<a name="line.294"></a>
-<span class="sourceLineNo">295</span> */<a name="line.295"></a>
-<span class="sourceLineNo">296</span> public HMaster getMaster(int serverNumber) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return masterThreads.get(serverNumber).getMaster();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> /**<a name="line.300"></a>
-<span class="sourceLineNo">301</span> * Gets the current active master, if available. If no active master, returns<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * null.<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * @return the HMaster for the active master<a name="line.303"></a>
-<span class="sourceLineNo">304</span> */<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public HMaster getActiveMaster() {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // Ensure that the current active master is not stopped.<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // We don't want to return a stopping master as an active master.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> if (mt.getMaster().isActiveMaster() && !mt.getMaster().isStopped()) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return mt.getMaster();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return null;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> /**<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @return Read-only list of master threads.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> */<a name="line.318"></a>
-<span class="sourceLineNo">319</span> public List<JVMClusterUtil.MasterThread> getMasters() {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> return Collections.unmodifiableList(this.masterThreads);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> /**<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @return List of running master servers (Some servers may have been killed<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * or aborted during lifetime of cluster; these servers are not included in<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * this list).<a name="line.326"></a>
-<span class="sourceLineNo">327</span> */<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public List<JVMClusterUtil.MasterThread> getLiveMasters() {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> List<JVMClusterUtil.MasterThread> liveServers = new ArrayList<>();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> List<JVMClusterUtil.MasterThread> list = getMasters();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for (JVMClusterUtil.MasterThread mt: list) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (mt.isAlive()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> liveServers.add(mt);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return liveServers;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> /**<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.340"></a>
-<span class="sourceLineNo">341</span> * @return Name of master that just went down.<a name="line.341"></a>
+<span class="sourceLineNo">261</span> * @return List of running servers (Some servers may have been killed or<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * aborted during lifetime of cluster; these servers are not included in this<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * list).<a name="line.263"></a>
+<span class="sourceLineNo">264</span> */<a name="line.264"></a>
+<span class="sourceLineNo">265</span> public List<JVMClusterUtil.RegionServerThread> getLiveRegionServers() {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> List<JVMClusterUtil.RegionServerThread> liveServers = new ArrayList<>();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> List<RegionServerThread> list = getRegionServers();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> for (JVMClusterUtil.RegionServerThread rst: list) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (rst.isAlive()) liveServers.add(rst);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> else LOG.info("Not alive " + rst.getName());<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> return liveServers;<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>
+<span class="sourceLineNo">275</span> /**<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * @return the Configuration used by this LocalHBaseCluster<a name="line.276"></a>
+<span class="sourceLineNo">277</span> */<a name="line.277"></a>
+<span class="sourceLineNo">278</span> public Configuration getConfiguration() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return this.conf;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> /**<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.283"></a>
+<span class="sourceLineNo">284</span> * @return Name of region server that just went down.<a name="line.284"></a>
+<span class="sourceLineNo">285</span> */<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public String waitOnRegionServer(int serverNumber) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> JVMClusterUtil.RegionServerThread regionServerThread = this.regionThreads.get(serverNumber);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return waitOnRegionServer(regionServerThread);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * Wait for the specified region server to stop. Removes this thread from list of running threads.<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * @return Name of region server that just went down.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> */<a name="line.294"></a>
+<span class="sourceLineNo">295</span> public String waitOnRegionServer(JVMClusterUtil.RegionServerThread rst) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> while (rst.isAlive()) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> try {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> rst.join();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> } catch (InterruptedException e) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> e.printStackTrace();<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> regionThreads.remove(rst);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return rst.getName();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @return the HMaster thread<a name="line.309"></a>
+<span class="sourceLineNo">310</span> */<a name="line.310"></a>
+<span class="sourceLineNo">311</span> public HMaster getMaster(int serverNumber) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return masterThreads.get(serverNumber).getMaster();<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> /**<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * Gets the current active master, if available. If no active master, returns<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * null.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @return the HMaster for the active master<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> public HMaster getActiveMaster() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> // Ensure that the current active master is not stopped.<a name="line.322"></a>
+<span class="sourceLineNo">323</span> // We don't want to return a stopping master as an active master.<a name="line.323"></a>
+<span class="sourceLineNo">324</span> if (mt.getMaster().isActiveMaster() && !mt.getMaster().isStopped()) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> return mt.getMaster();<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> return null;<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @return Read-only list of master threads.<a name="line.332"></a>
+<span class="sourceLineNo">333</span> */<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public List<JVMClusterUtil.MasterThread> getMasters() {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return Collections.unmodifiableList(this.masterThreads);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> /**<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * @return List of running master servers (Some servers may have been killed<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * or aborted during lifetime of cluster; these servers are not included in<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * this list).<a name="line.341"></a>
<span class="sourceLineNo">342</span> */<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public String waitOnMaster(int serverNumber) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> return waitOnMaster(masterThread);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @return Name of master that just went down.<a name="line.350"></a>
-<span class="sourceLineNo">351</span> */<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> while (masterThread.isAlive()) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> try {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.355"></a>
-<span class="sourceLineNo">356</span> masterThread.join();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> } catch (InterruptedException e) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> e.printStackTrace();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> masterThreads.remove(masterThread);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return masterThread.getName();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<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> * Wait for Mini HBase Cluster to shut down.<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * Presumes you've already called {@link #shutdown()}.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> */<a name="line.368"></a>
-<span class="sourceLineNo">369</span> public void join() {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> if (this.regionThreads != null) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> for(Thread t: this.regionThreads) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> if (t.isAlive()) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> try {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> Threads.threadDumpingIsAlive(t);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> } catch (InterruptedException e) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> LOG.debug("Interrupted", e);<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (this.masterThreads != null) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> for (Thread t : this.masterThreads) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> if (t.isAlive()) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> try {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> Threads.threadDumpingIsAlive(t);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> } catch (InterruptedException e) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> LOG.debug("Interrupted", e);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span> /**<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * Start the cluster.<a name="line.395"></a>
-<span class="sourceLineNo">396</span> */<a name="line.396"></a>
-<span class="sourceLineNo">397</span> public void startup() throws IOException {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Shut down the mini HBase cluster<a name="line.402"></a>
-<span class="sourceLineNo">403</span> */<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public void shutdown() {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> /**<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * @param c Configuration to check.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * @return True if a 'local' address in hbase.master value.<a name="line.410"></a>
+<span class="sourceLineNo">343</span> public List<JVMClusterUtil.MasterThread> getLiveMasters() {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> List<JVMClusterUtil.MasterThread> liveServers = new ArrayList<>();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> List<JVMClusterUtil.MasterThread> list = getMasters();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> for (JVMClusterUtil.MasterThread mt: list) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (mt.isAlive()) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> liveServers.add(mt);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return liveServers;<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> /**<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return Name of master that just went down.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public String waitOnMaster(int serverNumber) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> return waitOnMaster(masterThread);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> /**<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * @return Name of master that just went down.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> */<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> while (masterThread.isAlive()) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> try {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.370"></a>
+<span class="sourceLineNo">371</span> masterThread.join();<a name="line.371"></a>
+<span class="sourceLineNo">372</span> } catch (InterruptedException e) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> e.printStackTrace();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> }<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> masterThreads.remove(masterThread);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return masterThread.getName();<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * Wait for Mini HBase Cluster to shut down.<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * Presumes you've already called {@link #shutdown()}.<a name="line.382"></a>
+<span class="sourceLineNo">383</span> */<a name="line.383"></a>
+<span class="sourceLineNo">384</span> public void join() {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (this.regionThreads != null) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> for(Thread t: this.regionThreads) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (t.isAlive()) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> try {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> Threads.threadDumpingIsAlive(t);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> } catch (InterruptedException e) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> LOG.debug("Interrupted", e);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (this.masterThreads != null) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> for (Thread t : this.masterThreads) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (t.isAlive()) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> try {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> Threads.threadDumpingIsAlive(t);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> } catch (InterruptedException e) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> LOG.debug("Interrupted", e);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> }<a name="line.406"></a>
+<span class="sourceLineNo">407</span> }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span> /**<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * Start the cluster.<a name="line.410"></a>
<span class="sourceLineNo">411</span> */<a name="line.411"></a>
-<span class="sourceLineNo">412</span> public static boolean isLocal(final Configuration c) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Test things basically work.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * @param args<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * @throws IOException<a name="line.420"></a>
-<span class="sourceLineNo">421</span> */<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public static void main(String[] args) throws IOException {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> Configuration conf = HBaseConfiguration.create();<a name="line.423"></a>
-<span class="sourceLineNo">424</span> LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> cluster.startup();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Connection connection = ConnectionFactory.createConnection(conf);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> Admin admin = connection.getAdmin();<a name="line.427"></a>
-<span class="sourceLineNo">428</span> try {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> HTableDescriptor htd =<a name="line.429"></a>
-<span class="sourceLineNo">430</span> new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.430"></a>
-<span class="sourceLineNo">431</span> admin.createTable(htd);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> } finally {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> admin.close();<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> connection.close();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> cluster.shutdown();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>}<a name="line.438"></a>
+<span class="sourceLineNo">412</span> public void startup() throws IOException {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * Shut down the mini HBase cluster<a name="line.417"></a>
+<span class="sourceLineNo">418</span> */<a name="line.418"></a>
+<span class="sourceLineNo">419</span> public void shutdown() {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * @param c Configuration to check.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @return True if a 'local' address in hbase.master value.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public static boolean isLocal(final Configuration c) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span> /**<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * Test things basically work.<a name="line.433"></a>
+<span class="sourceLineNo">434</span> * @param args<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * @throws IOException<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> public static void main(String[] args) throws IOException {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> Configuration conf = HBaseConfiguration.create();<a name="line.438"></a>
+<span class="sourceLineNo">439</span> LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> cluster.startup();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> Connection connection = ConnectionFactory.createConnection(conf);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> Admin admin = connection.getAdmin();<a name="line.442"></a>
+<span class="sourceLineNo">443</span> try {<a name="line.443"></a>
+<span class="sourceLineNo">444</span> HTableDescriptor htd =<a name="line.444"></a>
+<span class="sourceLineNo">445</span> new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.445"></a>
+<span class="sourceLineNo">446</span> admin.createTable(htd);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> } finally {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> admin.close();<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span> connection.close();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> cluster.shutdown();<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>}<a name="line.453"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index aa2e6f7..3e44858 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
<span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
<span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
<span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span> public static final String revision = "4f2dfd387779968d3b76a22f1f4189d3278b202d";<a name="line.11"></a>
+<span class="sourceLineNo">011</span> public static final String revision = "8ba2a7eeb967a80d04020e30b2fe8e8652ea1758";<a name="line.11"></a>
<span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span> public static final String date = "Wed May 9 15:23:26 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span> public static final String date = "Thu May 10 14:39:10 UTC 2018";<a name="line.13"></a>
<span class="sourceLineNo">014</span> public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span> public static final String srcChecksum = "3d3c386d39a315d3821dcd77bdbf3342";<a name="line.15"></a>
+<span class="sourceLineNo">015</span> public static final String srcChecksum = "c0e2dabb9168862e94db0866785192b1";<a name="line.15"></a>
<span class="sourceLineNo">016</span>}<a name="line.16"></a>
[25/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.AssignRegionAction.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
[23/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
[21/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
index 41c0dae..f5ac8fc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
@@ -280,303 +280,309 @@
<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
<span class="sourceLineNo">273</span> POOL.latchCountUp();<a name="line.273"></a>
<span class="sourceLineNo">274</span> if (runCleaner()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> LOG.debug("Cleaned all WALs under {}", oldFileDir);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } else {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> LOG.warn("WALs outstanding under {}", oldFileDir);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> } finally {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> POOL.latchCountDown();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> LOG.debug("Cleaner chore disabled! Not cleaning.");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private void preRunCleaner() {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> public Boolean runCleaner() {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> preRunCleaner();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> POOL.submit(task);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return task.join();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Sort the given list in (descending) order of the space each element takes<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.307"></a>
-<span class="sourceLineNo">308</span> */<a name="line.308"></a>
-<span class="sourceLineNo">309</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (dirs == null || dirs.size() < 2) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> // no need to sort for empty or single directory<a name="line.311"></a>
-<span class="sourceLineNo">312</span> return;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> long f1ConsumedSpace = getSpace(f1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> long f2ConsumedSpace = getSpace(f2);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> private long getSpace(FileStatus f) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> Long cached = directorySpaces.get(f);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> if (cached != null) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return cached;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> long space =<a name="line.330"></a>
-<span class="sourceLineNo">331</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> directorySpaces.put(f, space);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return space;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } catch (IOException e) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return -1;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> });<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> /**<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * necessary.<a name="line.344"></a>
-<span class="sourceLineNo">345</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * @return true iff successfully deleted all files<a name="line.346"></a>
-<span class="sourceLineNo">347</span> */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (files == null) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return true;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // first check to see if the path is valid<a name="line.353"></a>
-<span class="sourceLineNo">354</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.354"></a>
-<span class="sourceLineNo">355</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> for (FileStatus file : files) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (validate(file.getPath())) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> validFiles.add(file);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> invalidFiles.add(file);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // check each of the cleaners for the valid files<a name="line.366"></a>
-<span class="sourceLineNo">367</span> for (T cleaner : cleanersChain) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.369"></a>
-<span class="sourceLineNo">370</span> + this.oldFileDir);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return false;<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> // trace which cleaner is holding on to each file<a name="line.376"></a>
-<span class="sourceLineNo">377</span> if (LOG.isTraceEnabled()) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> for (FileStatus file : deletableValidFiles) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (!filteredFileSet.contains(file)) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> deletableValidFiles = filteredFiles;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return deleteFiles(filesToDelete) == files.size();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * Delete the given files<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param filesToDelete files to delete<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * @return number of deleted files<a name="line.396"></a>
-<span class="sourceLineNo">397</span> */<a name="line.397"></a>
-<span class="sourceLineNo">398</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int deletedFileCount = 0;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> for (FileStatus file : filesToDelete) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> Path filePath = file.getPath();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> LOG.trace("Removing {} from archive", filePath);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> try {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> boolean success = this.fs.delete(filePath, false);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> if (success) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> deletedFileCount++;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> LOG.warn("Attempted to delete:" + filePath<a name="line.408"></a>
-<span class="sourceLineNo">409</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (IOException e) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> e = e instanceof RemoteException ?<a name="line.412"></a>
-<span class="sourceLineNo">413</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return deletedFileCount;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> @Override<a name="line.420"></a>
-<span class="sourceLineNo">421</span> public synchronized void cleanup() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> for (T lc : this.cleanersChain) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> try {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> lc.stop("Exiting");<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } catch (Throwable t) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> LOG.warn("Stopping", t);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> @VisibleForTesting<a name="line.431"></a>
-<span class="sourceLineNo">432</span> int getChorePoolSize() {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return POOL.size;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * @param enabled<a name="line.437"></a>
-<span class="sourceLineNo">438</span> */<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public boolean setEnabled(final boolean enabled) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return this.enabled.getAndSet(enabled);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> public boolean getEnabled() { return this.enabled.get();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> private interface Action<T> {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> T act() throws IOException;<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> */<a name="line.453"></a>
-<span class="sourceLineNo">454</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> private final Path dir;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> private final boolean root;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> this(dir.getPath(), root);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> CleanerTask(final Path dir, final boolean root) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> this.dir = dir;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> this.root = root;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> @Override<a name="line.467"></a>
-<span class="sourceLineNo">468</span> protected Boolean compute() {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> LOG.debug("Cleaning under {}", dir);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> List<FileStatus> subDirs;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> List<FileStatus> files;<a name="line.471"></a>
-<span class="sourceLineNo">472</span> try {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // which will fall through to succeeding.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.475"></a>
-<span class="sourceLineNo">476</span> files = getFilteredStatus(status -> status.isFile());<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } catch (IOException ioe) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> return false;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> boolean nullSubDirs = subDirs == null;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (nullSubDirs) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> LOG.trace("There is no subdir under {}", dir);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> if (files == null) {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> LOG.trace("There is no file under {}", dir);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.490"></a>
-<span class="sourceLineNo">491</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if (!nullSubDirs) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> sortByConsumedSpace(subDirs);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (FileStatus subdir : subDirs) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> tasks.add(task);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> task.fork();<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> boolean result = true;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.502"></a>
-<span class="sourceLineNo">503</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.504"></a>
-<span class="sourceLineNo">505</span> // it is not the root dir, then task will try to delete it.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> if (result && !root) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> return result;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> /**<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * Get FileStatus with filter.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * even though status is empty but not null.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * @param function a filter function<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @throws IOException if there's an error other than dir not existing<a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Perform a delete on a specified type.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * @param deletion a delete<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * @return true if it deleted successfully, false otherwise<a name="line.528"></a>
-<span class="sourceLineNo">529</span> */<a name="line.529"></a>
-<span class="sourceLineNo">530</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span> boolean deleted;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> try {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> deleted = deletion.act();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.536"></a>
-<span class="sourceLineNo">537</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.537"></a>
-<span class="sourceLineNo">538</span> // message below.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.539"></a>
-<span class="sourceLineNo">540</span> "exception details at TRACE.", dir);<a name="line.540"></a>
-<span class="sourceLineNo">541</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> deleted = false;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> } catch (IOException ioe) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.544"></a>
-<span class="sourceLineNo">545</span> "happening, use following exception when asking on mailing list.",<a name="line.545"></a>
-<span class="sourceLineNo">546</span> type, dir, ioe);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> deleted = false;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> return deleted;<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> /**<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * Get cleaner results of subdirs.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * @param tasks subdirs cleaner tasks<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.556"></a>
-<span class="sourceLineNo">557</span> * @throws IOException something happen during computation<a name="line.557"></a>
-<span class="sourceLineNo">558</span> */<a name="line.558"></a>
-<span class="sourceLineNo">559</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> boolean cleaned = true;<a name="line.560"></a>
-<span class="sourceLineNo">561</span> try {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> for (CleanerTask task : tasks) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> cleaned &= task.get();<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> } catch (InterruptedException | ExecutionException e) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> throw new IOException(e);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span> return cleaned;<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>}<a name="line.571"></a>
+<span class="sourceLineNo">275</span> if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> LOG.trace("Cleaned all WALs under {}", oldFileDir);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> } else {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (LOG.isTraceEnabled()) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> LOG.trace("WALs outstanding under {}", oldFileDir);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> } finally {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> POOL.latchCountDown();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> } else {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (LOG.isTraceEnabled()) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> LOG.trace("Cleaner chore disabled! Not cleaning.");<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> private void preRunCleaner() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> public Boolean runCleaner() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> preRunCleaner();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> POOL.submit(task);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return task.join();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * Sort the given list in (descending) order of the space each element takes<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (dirs == null || dirs.size() < 2) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // no need to sort for empty or single directory<a name="line.317"></a>
+<span class="sourceLineNo">318</span> return;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> @Override<a name="line.323"></a>
+<span class="sourceLineNo">324</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> long f1ConsumedSpace = getSpace(f1);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long f2ConsumedSpace = getSpace(f2);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<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> private long getSpace(FileStatus f) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Long cached = directorySpaces.get(f);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (cached != null) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return cached;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> long space =<a name="line.336"></a>
+<span class="sourceLineNo">337</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> directorySpaces.put(f, space);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return space;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } catch (IOException e) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> return -1;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span> });<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * necessary.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * @return true iff successfully deleted all files<a name="line.352"></a>
+<span class="sourceLineNo">353</span> */<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> if (files == null) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return true;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> // first check to see if the path is valid<a name="line.359"></a>
+<span class="sourceLineNo">360</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.360"></a>
+<span class="sourceLineNo">361</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (FileStatus file : files) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (validate(file.getPath())) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> validFiles.add(file);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.366"></a>
+<span class="sourceLineNo">367</span> invalidFiles.add(file);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> // check each of the cleaners for the valid files<a name="line.372"></a>
+<span class="sourceLineNo">373</span> for (T cleaner : cleanersChain) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.375"></a>
+<span class="sourceLineNo">376</span> + this.oldFileDir);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return false;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> // trace which cleaner is holding on to each file<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (LOG.isTraceEnabled()) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (FileStatus file : deletableValidFiles) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (!filteredFileSet.contains(file)) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> deletableValidFiles = filteredFiles;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> return deleteFiles(filesToDelete) == files.size();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * Delete the given files<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * @param filesToDelete files to delete<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * @return number of deleted files<a name="line.402"></a>
+<span class="sourceLineNo">403</span> */<a name="line.403"></a>
+<span class="sourceLineNo">404</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> int deletedFileCount = 0;<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for (FileStatus file : filesToDelete) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> Path filePath = file.getPath();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> LOG.trace("Removing {} from archive", filePath);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> try {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> boolean success = this.fs.delete(filePath, false);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (success) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> deletedFileCount++;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> } else {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> LOG.warn("Attempted to delete:" + filePath<a name="line.414"></a>
+<span class="sourceLineNo">415</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> } catch (IOException e) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> e = e instanceof RemoteException ?<a name="line.418"></a>
+<span class="sourceLineNo">419</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return deletedFileCount;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public synchronized void cleanup() {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> for (T lc : this.cleanersChain) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> try {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> lc.stop("Exiting");<a name="line.430"></a>
+<span class="sourceLineNo">431</span> } catch (Throwable t) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> LOG.warn("Stopping", t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @VisibleForTesting<a name="line.437"></a>
+<span class="sourceLineNo">438</span> int getChorePoolSize() {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return POOL.size;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * @param enabled<a name="line.443"></a>
+<span class="sourceLineNo">444</span> */<a name="line.444"></a>
+<span class="sourceLineNo">445</span> public boolean setEnabled(final boolean enabled) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> return this.enabled.getAndSet(enabled);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> public boolean getEnabled() { return this.enabled.get();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> private interface Action<T> {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> T act() throws IOException;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> /**<a name="line.456"></a>
+<span class="sourceLineNo">457</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> */<a name="line.459"></a>
+<span class="sourceLineNo">460</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> private final Path dir;<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private final boolean root;<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this(dir.getPath(), root);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> CleanerTask(final Path dir, final boolean root) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> this.dir = dir;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> this.root = root;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> @Override<a name="line.473"></a>
+<span class="sourceLineNo">474</span> protected Boolean compute() {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> LOG.debug("Cleaning under {}", dir);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> List<FileStatus> subDirs;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> List<FileStatus> files;<a name="line.477"></a>
+<span class="sourceLineNo">478</span> try {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // which will fall through to succeeding.<a name="line.480"></a>
+<span class="sourceLineNo">481</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> files = getFilteredStatus(status -> status.isFile());<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } catch (IOException ioe) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> return false;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> boolean nullSubDirs = subDirs == null;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (nullSubDirs) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> LOG.trace("There is no subdir under {}", dir);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span> if (files == null) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> LOG.trace("There is no file under {}", dir);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.496"></a>
+<span class="sourceLineNo">497</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (!nullSubDirs) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> sortByConsumedSpace(subDirs);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> for (FileStatus subdir : subDirs) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> tasks.add(task);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> task.fork();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> boolean result = true;<a name="line.507"></a>
+<span class="sourceLineNo">508</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.508"></a>
+<span class="sourceLineNo">509</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.509"></a>
+<span class="sourceLineNo">510</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // it is not the root dir, then task will try to delete it.<a name="line.511"></a>
+<span class="sourceLineNo">512</span> if (result && !root) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span> return result;<a name="line.515"></a>
+<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span> /**<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * Get FileStatus with filter.<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * even though status is empty but not null.<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * @param function a filter function<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @throws IOException if there's an error other than dir not existing<a name="line.524"></a>
+<span class="sourceLineNo">525</span> */<a name="line.525"></a>
+<span class="sourceLineNo">526</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Perform a delete on a specified type.<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * @param deletion a delete<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * @return true if it deleted successfully, false otherwise<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> boolean deleted;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> try {<a name="line.538"></a>
+<span class="sourceLineNo">539</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> deleted = deletion.act();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.542"></a>
+<span class="sourceLineNo">543</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.543"></a>
+<span class="sourceLineNo">544</span> // message below.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.545"></a>
+<span class="sourceLineNo">546</span> "exception details at TRACE.", dir);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> deleted = false;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> } catch (IOException ioe) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.550"></a>
+<span class="sourceLineNo">551</span> "happening, use following exception when asking on mailing list.",<a name="line.551"></a>
+<span class="sourceLineNo">552</span> type, dir, ioe);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> deleted = false;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> }<a name="line.554"></a>
+<span class="sourceLineNo">555</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return deleted;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
+<span class="sourceLineNo">560</span> * Get cleaner results of subdirs.<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * @param tasks subdirs cleaner tasks<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * @throws IOException something happen during computation<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.565"></a>
+<span class="sourceLineNo">566</span> boolean cleaned = true;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> try {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> for (CleanerTask task : tasks) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> cleaned &= task.get();<a name="line.569"></a>
+<span class="sourceLineNo">570</span> }<a name="line.570"></a>
+<span class="sourceLineNo">571</span> } catch (InterruptedException | ExecutionException e) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new IOException(e);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return cleaned;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>}<a name="line.577"></a>
[22/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
[33/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/checkstyle-aggregate.html
----------------------------------------------------------------------
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index debf06a..ca28c38 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Checkstyle Results</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -281,10 +281,10 @@
<th><img src="images/icon_warning_sml.gif" alt="" /> Warnings</th>
<th><img src="images/icon_error_sml.gif" alt="" /> Errors</th></tr>
<tr class="b">
-<td>3609</td>
+<td>3610</td>
<td>0</td>
<td>0</td>
-<td>15879</td></tr></table></div>
+<td>15878</td></tr></table></div>
<div class="section">
<h2><a name="Files"></a>Files</h2>
<table border="0" class="table table-striped">
@@ -5077,7 +5077,7 @@
<td><a href="#org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.java">org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java</a></td>
<td>0</td>
<td>0</td>
-<td>61</td></tr>
+<td>60</td></tr>
<tr class="a">
<td><a href="#org.apache.hadoop.hbase.master.balancer.ClusterLoadState.java">org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java</a></td>
<td>0</td>
@@ -10234,7 +10234,7 @@
<tr class="a">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_blocks.html#NeedBraces">NeedBraces</a></td>
-<td>1935</td>
+<td>1934</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td>coding</td>
@@ -10327,12 +10327,12 @@
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
<ul>
<li>offset: <tt>"2"</tt></li></ul></td>
-<td>783</td>
+<td>797</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>3836</td>
+<td>3822</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td>misc</td>
@@ -11816,1555 +11816,1555 @@
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>391</td></tr>
+<td>381</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>393</td></tr>
+<td>383</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child have incorrect indentation level 7, expected level should be 8.</td>
-<td>470</td></tr>
+<td>460</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method call' child have incorrect indentation level 9, expected level should be 10.</td>
-<td>471</td></tr>
+<td>461</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method call' child have incorrect indentation level 9, expected level should be 10.</td>
-<td>472</td></tr>
+<td>462</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method call' child have incorrect indentation level 9, expected level should be 10.</td>
-<td>473</td></tr>
+<td>463</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method call rparen' have incorrect indentation level 7, expected level should be 8.</td>
-<td>474</td></tr>
+<td>464</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>486</td></tr>
+<td>476</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>568</td></tr>
+<td>558</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>572</td></tr>
+<td>562</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>580</td></tr>
+<td>570</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>584</td></tr>
+<td>574</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>592</td></tr>
+<td>582</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>602</td></tr>
+<td>592</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>617</td></tr>
+<td>607</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>misc</td>
<td>ArrayTypeStyle</td>
<td>Array brackets at illegal position.</td>
-<td>621</td></tr>
+<td>611</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>whitespace</td>
<td>ParenPad</td>
<td>'(' is followed by whitespace.</td>
-<td>623</td></tr>
+<td>613</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>635</td></tr>
+<td>625</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>misc</td>
<td>ArrayTypeStyle</td>
<td>Array brackets at illegal position.</td>
-<td>639</td></tr>
+<td>629</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>misc</td>
<td>ArrayTypeStyle</td>
<td>Array brackets at illegal position.</td>
-<td>656</td></tr>
+<td>646</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>misc</td>
<td>ArrayTypeStyle</td>
<td>Array brackets at illegal position.</td>
-<td>656</td></tr>
+<td>646</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>763</td></tr>
+<td>753</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>778</td></tr>
+<td>768</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>788</td></tr>
+<td>778</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>800</td></tr>
+<td>790</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>815</td></tr>
+<td>805</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>816</td></tr>
+<td>806</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>817</td></tr>
+<td>807</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>818</td></tr>
+<td>808</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>835</td></tr>
+<td>825</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 6, expected level should be 4.</td>
-<td>842</td></tr>
+<td>832</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>847</td></tr>
+<td>837</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>870</td></tr>
+<td>860</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>871</td></tr>
+<td>861</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>873</td></tr>
+<td>863</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>874</td></tr>
+<td>864</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>875</td></tr>
+<td>865</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>876</td></tr>
+<td>866</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>877</td></tr>
+<td>867</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>878</td></tr>
+<td>868</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>880</td></tr>
+<td>870</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>881</td></tr>
+<td>871</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>882</td></tr>
+<td>872</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>883</td></tr>
+<td>873</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>884</td></tr>
+<td>874</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>909</td></tr>
+<td>899</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>910</td></tr>
+<td>900</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>912</td></tr>
+<td>902</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>913</td></tr>
+<td>903</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>914</td></tr>
+<td>904</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>915</td></tr>
+<td>905</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>916</td></tr>
+<td>906</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>917</td></tr>
+<td>907</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>919</td></tr>
+<td>909</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>920</td></tr>
+<td>910</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>921</td></tr>
+<td>911</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>922</td></tr>
+<td>912</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>925</td></tr>
+<td>915</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>926</td></tr>
+<td>916</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>952</td></tr>
+<td>942</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'else' construct must use '{}'s.</td>
-<td>981</td></tr>
+<td>971</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 5, expected level should be 4.</td>
-<td>995</td></tr>
+<td>985</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>1012</td></tr>
+<td>1002</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1014</td></tr>
+<td>1004</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1015</td></tr>
+<td>1005</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1064</td></tr>
+<td>1054</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>EmptyBlock</td>
<td>Must have at least one statement.</td>
-<td>1076</td></tr>
+<td>1066</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>1087</td></tr>
+<td>1077</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1100</td></tr>
+<td>1090</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1120</td></tr>
+<td>1110</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1150</td></tr>
+<td>1140</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1165</td></tr>
+<td>1155</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>1177</td></tr>
+<td>1167</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>1178</td></tr>
+<td>1168</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>1179</td></tr>
+<td>1169</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1181</td></tr>
+<td>1171</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1196</td></tr>
+<td>1186</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1209</td></tr>
+<td>1199</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1231</td></tr>
+<td>1221</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1239</td></tr>
+<td>1229</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1247</td></tr>
+<td>1237</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1255</td></tr>
+<td>1245</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1263</td></tr>
+<td>1253</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1264</td></tr>
+<td>1254</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1266</td></tr>
+<td>1256</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1275</td></tr>
+<td>1265</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1276</td></tr>
+<td>1266</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1278</td></tr>
+<td>1268</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1291</td></tr>
+<td>1281</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1292</td></tr>
+<td>1282</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1294</td></tr>
+<td>1284</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1303</td></tr>
+<td>1293</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1304</td></tr>
+<td>1294</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1305</td></tr>
+<td>1295</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1307</td></tr>
+<td>1297</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>1311</td></tr>
+<td>1301</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1321</td></tr>
+<td>1311</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1322</td></tr>
+<td>1312</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1324</td></tr>
+<td>1314</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1333</td></tr>
+<td>1323</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1334</td></tr>
+<td>1324</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1336</td></tr>
+<td>1326</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1344</td></tr>
+<td>1334</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1345</td></tr>
+<td>1335</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1346</td></tr>
+<td>1336</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1348</td></tr>
+<td>1338</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1369</td></tr>
+<td>1359</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1370</td></tr>
+<td>1360</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1373</td></tr>
+<td>1363</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1430</td></tr>
+<td>1420</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1443</td></tr>
+<td>1433</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1444</td></tr>
+<td>1434</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1445</td></tr>
+<td>1435</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1448</td></tr>
+<td>1438</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1457</td></tr>
+<td>1447</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1458</td></tr>
+<td>1448</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1459</td></tr>
+<td>1449</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1461</td></tr>
+<td>1451</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1470</td></tr>
+<td>1460</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1471</td></tr>
+<td>1461</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1472</td></tr>
+<td>1462</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1474</td></tr>
+<td>1464</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1483</td></tr>
+<td>1473</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1484</td></tr>
+<td>1474</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1485</td></tr>
+<td>1475</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1486</td></tr>
+<td>1476</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1488</td></tr>
+<td>1478</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1506</td></tr>
+<td>1496</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1507</td></tr>
+<td>1497</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1508</td></tr>
+<td>1498</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1510</td></tr>
+<td>1500</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1519</td></tr>
+<td>1509</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1520</td></tr>
+<td>1510</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1521</td></tr>
+<td>1511</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1522</td></tr>
+<td>1512</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1524</td></tr>
+<td>1514</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 6, expected level should be 4.</td>
-<td>1544</td></tr>
+<td>1534</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'for' have incorrect indentation level 6, expected level should be 4.</td>
-<td>1545</td></tr>
+<td>1535</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'for' child have incorrect indentation level 8, expected level should be 6.</td>
-<td>1546</td></tr>
+<td>1536</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'for' child have incorrect indentation level 8, expected level should be 6.</td>
-<td>1549</td></tr>
+<td>1539</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'for rcurly' have incorrect indentation level 6, expected level should be 4.</td>
-<td>1550</td></tr>
+<td>1540</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' have incorrect indentation level 6, expected level should be 4.</td>
-<td>1551</td></tr>
+<td>1541</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if' child have incorrect indentation level 8, expected level should be 6.</td>
-<td>1552</td></tr>
+<td>1542</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'if rcurly' have incorrect indentation level 6, expected level should be 4.</td>
-<td>1553</td></tr>
+<td>1543</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 6, expected level should be 4.</td>
-<td>1554</td></tr>
+<td>1544</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 6, expected level should be 4.</td>
-<td>1557</td></tr>
+<td>1547</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 6, expected level should be 4.</td>
-<td>1558</td></tr>
+<td>1548</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rcurly' have incorrect indentation level 4, expected level should be 2.</td>
-<td>1559</td></tr>
+<td>1549</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1563</td></tr>
+<td>1553</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1564</td></tr>
+<td>1554</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1565</td></tr>
+<td>1555</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1567</td></tr>
+<td>1557</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1589</td></tr>
+<td>1579</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1590</td></tr>
+<td>1580</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1591</td></tr>
+<td>1581</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1593</td></tr>
+<td>1583</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1609</td></tr>
+<td>1599</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1610</td></tr>
+<td>1600</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1612</td></tr>
+<td>1602</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child have incorrect indentation level 6, expected level should be one of the following: 8, 10.</td>
-<td>1626</td></tr>
+<td>1616</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block' child have incorrect indentation level 6, expected level should be one of the following: 8, 10.</td>
-<td>1627</td></tr>
+<td>1617</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'block rcurly' have incorrect indentation level 4, expected level should be one of the following: 6, 8.</td>
-<td>1628</td></tr>
+<td>1618</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
-<td>1698</td></tr>
+<td>1688</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>annotation</td>
<td>MissingDeprecated</td>
<td>Must include both @java.lang.Deprecated annotation and @deprecated Javadoc tag with description.</td>
-<td>1710</td></tr>
+<td>1700</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1759</td></tr>
+<td>1749</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1760</td></tr>
+<td>1750</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1761</td></tr>
+<td>1751</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1762</td></tr>
+<td>1752</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1763</td></tr>
+<td>1753</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1786</td></tr>
+<td>1776</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1794</td></tr>
+<td>1784</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1795</td></tr>
+<td>1785</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1796</td></tr>
+<td>1786</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1797</td></tr>
+<td>1787</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1798</td></tr>
+<td>1788</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1799</td></tr>
+<td>1789</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1800</td></tr>
+<td>1790</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1801</td></tr>
+<td>1791</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1817</td></tr>
+<td>1807</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1818</td></tr>
+<td>1808</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1819</td></tr>
+<td>1809</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1820</td></tr>
+<td>1810</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1821</td></tr>
+<td>1811</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1824</td></tr>
+<td>1814</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1866</td></tr>
+<td>1856</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1916</td></tr>
+<td>1906</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1927</td></tr>
+<td>1917</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1938</td></tr>
+<td>1928</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1950</td></tr>
+<td>1940</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>1962</td></tr>
+<td>1952</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2046</td></tr>
+<td>2036</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>2150</td></tr>
+<td>2140</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2292</td></tr>
+<td>2282</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2293</td></tr>
+<td>2283</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2294</td></tr>
+<td>2284</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2296</td></tr>
+<td>2286</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2310</td></tr>
+<td>2300</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2311</td></tr>
+<td>2301</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2312</td></tr>
+<td>2302</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2314</td></tr>
+<td>2304</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2444</td></tr>
+<td>2434</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2445</td></tr>
+<td>2435</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2648</td></tr>
+<td>2638</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 3, expected level should be 4.</td>
-<td>2686</td></tr>
+<td>2676</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def modifier' have incorrect indentation level 6, expected level should be one of the following: 8, 10.</td>
-<td>2717</td></tr>
+<td>2707</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 8, expected level should be one of the following: 10, 12.</td>
-<td>2719</td></tr>
+<td>2709</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rcurly' have incorrect indentation level 6, expected level should be one of the following: 8, 10.</td>
-<td>2720</td></tr>
+<td>2710</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'object def rcurly' have incorrect indentation level 4, expected level should be one of the following: 6, 8.</td>
-<td>2721</td></tr>
+<td>2711</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'while' child have incorrect indentation level 7, expected level should be 6.</td>
-<td>2732</td></tr>
+<td>2722</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2773</td></tr>
+<td>2763</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2849</td></tr>
+<td>2839</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>2881</td></tr>
+<td>2871</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>2908</td></tr>
+<td>2898</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2929</td></tr>
+<td>2919</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2930</td></tr>
+<td>2920</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2946</td></tr>
+<td>2936</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>2947</td></tr>
+<td>2937</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3001</td></tr>
+<td>2991</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3004</td></tr>
+<td>2994</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3021</td></tr>
+<td>3011</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3022</td></tr>
+<td>3012</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3023</td></tr>
+<td>3013</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3036</td></tr>
+<td>3026</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3037</td></tr>
+<td>3027</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3053</td></tr>
+<td>3043</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3054</td></tr>
+<td>3044</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3070</td></tr>
+<td>3060</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3071</td></tr>
+<td>3061</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3083</td></tr>
+<td>3073</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3104</td></tr>
+<td>3094</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3136</td></tr>
+<td>3126</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3192</td></tr>
+<td>3182</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3193</td></tr>
+<td>3183</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3194</td></tr>
+<td>3184</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3195</td></tr>
+<td>3185</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3196</td></tr>
+<td>3186</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3222</td></tr>
+<td>3212</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3238</td></tr>
+<td>3228</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3239</td></tr>
+<td>3229</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3265</td></tr>
+<td>3255</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3274</td></tr>
+<td>3264</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3288</td></tr>
+<td>3278</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>coding</td>
<td>InnerAssignment</td>
<td>Inner assignments should be avoided.</td>
-<td>3308</td></tr>
+<td>3298</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 104).</td>
-<td>3339</td></tr>
+<td>3329</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3398</td></tr>
+<td>3388</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3399</td></tr>
+<td>3389</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3401</td></tr>
+<td>3391</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rparen' have incorrect indentation level 48, expected level should be 2.</td>
-<td>3419</td></tr>
+<td>3409</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>EmptyBlock</td>
<td>Must have at least one statement.</td>
-<td>3437</td></tr>
+<td>3427</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 101).</td>
-<td>3728</td></tr>
+<td>3718</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3815</td></tr>
+<td>3805</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3817</td></tr>
+<td>3807</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3851</td></tr>
+<td>3841</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3888</td></tr>
+<td>3878</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>3890</td></tr>
+<td>3880</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3968</td></tr>
+<td>3958</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3976</td></tr>
+<td>3966</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3984</td></tr>
+<td>3974</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>3985</td></tr></table></div>
+<td>3975</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.HColumnDescriptor.java">org/apache/hadoop/hbase/HColumnDescriptor.java</h3>
<table border="0" class="table table-striped">
@@ -14541,7 +14541,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 26 has parse error. Missed HTML close tag 'arg'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>44</td></tr></table></div>
<div class="section">
@@ -15177,7 +15177,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 4 has parse error. Missed HTML close tag 'pre'. Sometimes it means that close tag missed for one of previous tags.</td>
<td>59</td></tr></table></div>
<div class="section">
@@ -16268,61 +16268,61 @@
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>231</td></tr>
+<td>246</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>247</td></tr>
+<td>262</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>248</td></tr>
+<td>263</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
-<td>254</td></tr>
+<td>269</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'else' construct must use '{}'s.</td>
-<td>255</td></tr>
+<td>270</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>325</td></tr>
+<td>340</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>326</td></tr>
+<td>341</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 104).</td>
-<td>413</td></tr>
+<td>428</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>419</td></tr>
+<td>434</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>420</td></tr></table></div>
+<td>435</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.MetaMockingUtil.java">org/apache/hadoop/hbase/MetaMockingUtil.java</h3>
<table border="0" class="table table-striped">
@@ -16796,103 +16796,103 @@
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>381</td></tr>
+<td>375</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>455</td></tr>
+<td>449</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>456</td></tr>
+<td>450</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>457</td></tr>
+<td>451</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>472</td></tr>
+<td>466</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>564</td></tr>
+<td>558</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>565</td></tr>
+<td>559</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>566</td></tr>
+<td>560</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>581</td></tr>
+<td>575</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>594</td></tr>
+<td>588</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>coding</td>
<td>InnerAssignment</td>
<td>Inner assignments should be avoided.</td>
-<td>600</td></tr>
+<td>594</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>701</td></tr>
+<td>695</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>714</td></tr>
+<td>708</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>729</td></tr>
+<td>723</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>744</td></tr>
+<td>738</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>777</td></tr>
+<td>771</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>787</td></tr></table></div>
+<td>781</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.MockRegionServerServices.java">org/apache/hadoop/hbase/MockRegionServerServices.java</h3>
<table border="0" class="table table-striped">
@@ -16932,7 +16932,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 19 has parse error. Details: no viable alternative at input '<code>\n * List<Future<' while parsing HTML_TAG</td>
<td>167</td></tr></table></div>
<div class="section">
@@ -19938,7 +19938,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 2 has parse error. Unrecognized error from ANTLR parser: null</td>
<td>83</td></tr>
<tr class="b">
@@ -33885,7 +33885,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 37 has parse error. Details: no viable alternative at input '<ColumnFamily,' while parsing HTML_ELEMENT</td>
<td>29</td></tr></table></div>
<div class="section">
@@ -50196,7 +50196,7 @@
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 24 has parse error. Details: no viable alternative at input '<key,' while parsing HTML_ELEMENT</td>
<td>25</td></tr>
<tr class="a">
@@ -52058,37 +52058,37 @@
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>124</td></tr>
+<td>128</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 102).</td>
-<td>134</td></tr>
+<td>138</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>160</td></tr>
+<td>164</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>172</td></tr>
+<td>176</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>259</td></tr>
+<td>262</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
-<td>260</td></tr></table></div>
+<td>263</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.io.hfile.bucket.FileMmapEngine.java">org/apache/hadoop/hbase/io/hfile/bucket/FileMmapEngine.java</h3>
<table border="0" class="table table-striped">
@@ -52337,7 +52337,7 @@
<td>indentation</td>
<td>Indentation</td>
<td>'array initialization' child have incorrect indentation level 6, expected level should be one of the following: 4, 46, 47.</td>
-<td>53</td></tr></table></div>
+<td>54</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.io.hfile.bucket.UniqueIndexMap.java">org/apache/hadoop/hbase/io/hfile/bucket/UniqueIndexMap.java</h3>
<table border="0" class="table table-striped">
@@ -53784,7 +53784,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 2 has parse error. Unrecognized error from ANTLR parser: null</td>
<td>587</td></tr>
<tr class="b">
@@ -67742,23 +67742,17 @@
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 105).</td>
-<td>1375</td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>blocks</td>
-<td>NeedBraces</td>
-<td>'if' construct must use '{}'s.</td>
-<td>1434</td></tr></table></div>
+<td>1375</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.ClusterLoadState.java">org/apache/hadoop/hbase/master/balancer/ClusterLoadState.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -67767,13 +67761,13 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.ClusterStatusChore.java">org/apache/hadoop/hbase/master/balancer/ClusterStatusChore.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
@@ -67782,19 +67776,19 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.FavoredStochasticBalancer.java">org/apache/hadoop/hbase/master/balancer/FavoredStochasticBalancer.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'segregateRegionsAndAssignRegionsWithFavoredNodes' have incorrect indentation level 2, expected level should be 4.</td>
<td>201</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>coding</td>
<td>InnerAssignment</td>
@@ -67803,25 +67797,25 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.LoadBalancerFactory.java">org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.conf.Configuration' import.</td>
<td>21</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>design</td>
<td>HideUtilityClassConstructor</td>
<td>Utility classes should not have a public or default constructor.</td>
<td>29</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
@@ -67830,13 +67824,13 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.LoadBalancerPerformanceEvaluation.java">org/apache/hadoop/hbase/master/balancer/LoadBalancerPerformanceEvaluation.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
@@ -67845,19 +67839,19 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.MetricsBalancerSourceImpl.java">org/apache/hadoop/hbase/master/balancer/MetricsBalancerSourceImpl.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.metrics.BaseSourceImpl' import.</td>
<td>22</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
@@ -67866,49 +67860,49 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.MetricsStochasticBalancerSourceImpl.java">org/apache/hadoop/hbase/master/balancer/MetricsStochasticBalancerSourceImpl.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.metrics.Interns' import.</td>
<td>26</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'object def' child have incorrect indentation level 8, expected level should be one of the following: 4, 6.</td>
<td>42</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def modifier' have incorrect indentation level 8, expected level should be one of the following: 4, 6.</td>
<td>44</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def' child have incorrect indentation level 10, expected level should be one of the following: 6, 8.</td>
<td>46</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'method def rcurly' have incorrect indentation level 8, expected level should be one of the following: 4, 6.</td>
<td>47</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'object def rcurly' have incorrect indentation level 6, expected level should be one of the following: 2, 4.</td>
<td>48</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -67917,19 +67911,19 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.RegionInfoComparator.java">org/apache/hadoop/hbase/master/balancer/RegionInfoComparator.java</h3>
<table border="0" class="table table-striped">
-<tr class="a">
+<tr class="b">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>34</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
@@ -67938,25 +67932,25 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.RegionLocationFinder.java">org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 102).</td>
<td>64</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
<td>NonEmptyAtclauseDescription</td>
<td>At-clause should have a non-empty description.</td>
<td>214</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
@@ -67965,13 +67959,13 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.ServerAndLoad.java">org/apache/hadoop/hbase/master/balancer/ServerAndLoad.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>imports</td>
<td>ImportOrder</td>
@@ -67980,205 +67974,205 @@
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer.java">org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java</h3>
<table border="0" class="table table-striped">
-<tr class="b">
+<tr class="a">
<th>Severity</th>
<th>Category</th>
<th>Rule</th>
<th>Message</th>
<th>Line</th></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 103).</td>
<td>113</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>115</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 114).</td>
<td>115</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 112).</td>
<td>134</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>MethodLength</td>
<td>Method length is 206 lines (max allowed is 150).</td>
<td>246</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>266</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>316</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>320</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>335</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>354</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>357</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>366</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>387</td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>389</td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>blocks</td>
<td>NeedBraces</td>
<td>'if' construct must use '{}'s.</td>
<td>408</td></tr>
-<tr class="b">
+<tr class="a
<TRUNCATED>
[15/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html b/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
index 869f6a1..3b08b86 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
@@ -341,2502 +341,2502 @@
<span class="sourceLineNo">333</span> // a hbase checksum verification failure will cause unit tests to fail<a name="line.333"></a>
<span class="sourceLineNo">334</span> ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.334"></a>
<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> // if conf is provided, prevent contention for ports if other hbase thread(s) are running<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (conf != null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.338"></a>
-<span class="sourceLineNo">339</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> LOG.debug("Config property {} changed to -1", HConstants.MASTER_INFO_PORT);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> LOG.debug("Config property {} changed to -1", HConstants.REGIONSERVER_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> // Save this for when setting default file:// breaks things<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // Every cluster is a local cluster until we start DFS<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Note that conf could be null, but this.conf will not be<a name="line.354"></a>
-<span class="sourceLineNo">355</span> String dataTestDir = getDataTestDir().toString();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.conf.set("fs.defaultFS","file:///");<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> /**<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @return a normal HBaseTestingUtility<a name="line.364"></a>
-<span class="sourceLineNo">365</span> */<a name="line.365"></a>
-<span class="sourceLineNo">366</span> @Deprecated<a name="line.366"></a>
-<span class="sourceLineNo">367</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return new HBaseTestingUtility();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return a normal HBaseTestingUtility<a name="line.373"></a>
-<span class="sourceLineNo">374</span> */<a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Deprecated<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return new HBaseTestingUtility(c);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> */<a name="line.382"></a>
-<span class="sourceLineNo">383</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> closeRegionAndWAL((HRegion)r);<a name="line.384"></a>
+<span class="sourceLineNo">336</span> // Save this for when setting default file:// breaks things<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Every cluster is a local cluster until we start DFS<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Note that conf could be null, but this.conf will not be<a name="line.340"></a>
+<span class="sourceLineNo">341</span> String dataTestDir = getDataTestDir().toString();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> this.conf.set("fs.defaultFS","file:///");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // If the value for random ports isn't set set it to true, thus making<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // tests opt-out for random port assignment<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.conf.setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS,<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true));<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> /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return a normal HBaseTestingUtility<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Deprecated<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return new HBaseTestingUtility();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @return a normal HBaseTestingUtility<a name="line.363"></a>
+<span class="sourceLineNo">364</span> */<a name="line.364"></a>
+<span class="sourceLineNo">365</span> @Deprecated<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> return new HBaseTestingUtility(c);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.371"></a>
+<span class="sourceLineNo">372</span> */<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> closeRegionAndWAL((HRegion)r);<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>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (r == null) return;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> r.close();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (r.getWAL() == null) return;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> r.getWAL().close();<a name="line.384"></a>
<span class="sourceLineNo">385</span> }<a name="line.385"></a>
<span class="sourceLineNo">386</span><a name="line.386"></a>
<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> */<a name="line.389"></a>
-<span class="sourceLineNo">390</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (r == null) return;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> r.close();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (r.getWAL() == null) return;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> r.getWAL().close();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * you use the returned Configuration since {@link Connection} instances<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * make a copy and use that. Do<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return Instance of Configuration.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> @Override<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public Configuration getConfiguration() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return super.getConfiguration();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> this.hbaseCluster = hbaseCluster;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * Give it a random name so can have many concurrent tests running if<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * System property, as it's what minidfscluster bases<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * instances -- another instance could grab the temporary<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * single instance only is how the minidfscluster works.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * We also create the underlying directory for<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.429"></a>
-<span class="sourceLineNo">430</span> *<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @return The calculated data test build directory, if newly-created.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected Path setupDataTestDir() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Path testPath = super.setupDataTestDir();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (null == testPath) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">388</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * you use the returned Configuration since {@link Connection} instances<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * make a copy and use that. Do<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.395"></a>
+<span class="sourceLineNo">396</span> * @return Instance of Configuration.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span> public Configuration getConfiguration() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return super.getConfiguration();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> this.hbaseCluster = hbaseCluster;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Give it a random name so can have many concurrent tests running if<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * System property, as it's what minidfscluster bases<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * instances -- another instance could grab the temporary<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * single instance only is how the minidfscluster works.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> *<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * We also create the underlying directory for<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.419"></a>
+<span class="sourceLineNo">420</span> *<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @return The calculated data test build directory, if newly-created.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> */<a name="line.422"></a>
+<span class="sourceLineNo">423</span> @Override<a name="line.423"></a>
+<span class="sourceLineNo">424</span> protected Path setupDataTestDir() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Path testPath = super.setupDataTestDir();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (null == testPath) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> createSubDirAndSystemProperty(<a name="line.430"></a>
+<span class="sourceLineNo">431</span> "hadoop.log.dir",<a name="line.431"></a>
+<span class="sourceLineNo">432</span> testPath, "hadoop-log-dir");<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // we want our own value to ensure uniqueness on the same machine<a name="line.435"></a>
+<span class="sourceLineNo">436</span> createSubDirAndSystemProperty(<a name="line.436"></a>
+<span class="sourceLineNo">437</span> "hadoop.tmp.dir",<a name="line.437"></a>
+<span class="sourceLineNo">438</span> testPath, "hadoop-tmp-dir");<a name="line.438"></a>
<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> createSubDirAndSystemProperty(<a name="line.440"></a>
-<span class="sourceLineNo">441</span> "hadoop.log.dir",<a name="line.441"></a>
-<span class="sourceLineNo">442</span> testPath, "hadoop-log-dir");<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // we want our own value to ensure uniqueness on the same machine<a name="line.445"></a>
-<span class="sourceLineNo">446</span> createSubDirAndSystemProperty(<a name="line.446"></a>
-<span class="sourceLineNo">447</span> "hadoop.tmp.dir",<a name="line.447"></a>
-<span class="sourceLineNo">448</span> testPath, "hadoop-tmp-dir");<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.450"></a>
-<span class="sourceLineNo">451</span> createSubDir(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> "mapreduce.cluster.local.dir",<a name="line.452"></a>
-<span class="sourceLineNo">453</span> testPath, "mapred-local-dir");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return testPath;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private void createSubDirAndSystemProperty(<a name="line.458"></a>
-<span class="sourceLineNo">459</span> String propertyName, Path parent, String subDirName){<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> String sysValue = System.getProperty(propertyName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (sysValue != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // There is already a value set. So we do nothing but hope<a name="line.464"></a>
-<span class="sourceLineNo">465</span> // that there will be no conflicts<a name="line.465"></a>
-<span class="sourceLineNo">466</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.466"></a>
-<span class="sourceLineNo">467</span> sysValue + " so I do NOT create it in " + parent);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> String confValue = conf.get(propertyName);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.warn(<a name="line.470"></a>
-<span class="sourceLineNo">471</span> propertyName + " property value differs in configuration and system: "+<a name="line.471"></a>
-<span class="sourceLineNo">472</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.472"></a>
-<span class="sourceLineNo">473</span> " Erasing configuration value by system value."<a name="line.473"></a>
-<span class="sourceLineNo">474</span> );<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> conf.set(propertyName, sysValue);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.478"></a>
-<span class="sourceLineNo">479</span> createSubDir(propertyName, parent, subDirName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * for the test filesystem by default<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @see #setupDataTestDirOnTestFS()<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @see #getTestFileSystem()<a name="line.488"></a>
+<span class="sourceLineNo">440</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.440"></a>
+<span class="sourceLineNo">441</span> createSubDir(<a name="line.441"></a>
+<span class="sourceLineNo">442</span> "mapreduce.cluster.local.dir",<a name="line.442"></a>
+<span class="sourceLineNo">443</span> testPath, "mapred-local-dir");<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> return testPath;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> private void createSubDirAndSystemProperty(<a name="line.448"></a>
+<span class="sourceLineNo">449</span> String propertyName, Path parent, String subDirName){<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> String sysValue = System.getProperty(propertyName);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (sysValue != null) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // There is already a value set. So we do nothing but hope<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // that there will be no conflicts<a name="line.455"></a>
+<span class="sourceLineNo">456</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.456"></a>
+<span class="sourceLineNo">457</span> sysValue + " so I do NOT create it in " + parent);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> String confValue = conf.get(propertyName);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.459"></a>
+<span class="sourceLineNo">460</span> LOG.warn(<a name="line.460"></a>
+<span class="sourceLineNo">461</span> propertyName + " property value differs in configuration and system: "+<a name="line.461"></a>
+<span class="sourceLineNo">462</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.462"></a>
+<span class="sourceLineNo">463</span> " Erasing configuration value by system value."<a name="line.463"></a>
+<span class="sourceLineNo">464</span> );<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> conf.set(propertyName, sysValue);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> } else {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.468"></a>
+<span class="sourceLineNo">469</span> createSubDir(propertyName, parent, subDirName);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * for the test filesystem by default<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @see #setupDataTestDirOnTestFS()<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @see #getTestFileSystem()<a name="line.478"></a>
+<span class="sourceLineNo">479</span> */<a name="line.479"></a>
+<span class="sourceLineNo">480</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> FileSystem fs = getTestFileSystem();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> /**<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return META table descriptor<a name="line.486"></a>
+<span class="sourceLineNo">487</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.488"></a>
<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> FileSystem fs = getTestFileSystem();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.492"></a>
+<span class="sourceLineNo">490</span> @Deprecated<a name="line.490"></a>
+<span class="sourceLineNo">491</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.492"></a>
<span class="sourceLineNo">493</span> }<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
<span class="sourceLineNo">496</span> * @return META table descriptor<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.498"></a>
-<span class="sourceLineNo">499</span> */<a name="line.499"></a>
-<span class="sourceLineNo">500</span> @Deprecated<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @return META table descriptor<a name="line.506"></a>
-<span class="sourceLineNo">507</span> */<a name="line.507"></a>
-<span class="sourceLineNo">508</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> try {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> } catch (IOException e) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * if the test relies on it.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * @return a unique path in the test filesystem<a name="line.520"></a>
-<span class="sourceLineNo">521</span> */<a name="line.521"></a>
-<span class="sourceLineNo">522</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (dataTestDirOnTestFS == null) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> setupDataTestDirOnTestFS();<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> return dataTestDirOnTestFS;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * if the test relies on it.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * @return a unique path in the test filesystem<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.535"></a>
-<span class="sourceLineNo">536</span> */<a name="line.536"></a>
-<span class="sourceLineNo">537</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * Sets up a path in test filesystem to be used by tests.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Creates a new directory if not already setup.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (dataTestDirOnTestFS != null) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.547"></a>
-<span class="sourceLineNo">548</span> + dataTestDirOnTestFS.toString());<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> /**<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.555"></a>
-<span class="sourceLineNo">556</span> */<a name="line.556"></a>
-<span class="sourceLineNo">557</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.558"></a>
-<span class="sourceLineNo">559</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.559"></a>
-<span class="sourceLineNo">560</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.560"></a>
-<span class="sourceLineNo">561</span> //the working directory, and create a unique sub dir there<a name="line.561"></a>
-<span class="sourceLineNo">562</span> FileSystem fs = getTestFileSystem();<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Path newDataTestDir;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> String randomStr = UUID.randomUUID().toString();<a name="line.564"></a>
-<span class="sourceLineNo">565</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } else {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path base = getBaseTestDirOnTestFS();<a name="line.570"></a>
-<span class="sourceLineNo">571</span> newDataTestDir = new Path(base, randomStr);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> return newDataTestDir;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * Cleans the test data directory on the test filesystem.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return True if we removed the test dirs<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * @throws IOException<a name="line.580"></a>
-<span class="sourceLineNo">581</span> */<a name="line.581"></a>
-<span class="sourceLineNo">582</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (ret)<a name="line.584"></a>
-<span class="sourceLineNo">585</span> dataTestDirOnTestFS = null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return ret;<a name="line.586"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> } catch (IOException e) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * if the test relies on it.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return a unique path in the test filesystem<a name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (dataTestDirOnTestFS == null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> setupDataTestDirOnTestFS();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> return dataTestDirOnTestFS;<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * if the test relies on it.<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return a unique path in the test filesystem<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.525"></a>
+<span class="sourceLineNo">526</span> */<a name="line.526"></a>
+<span class="sourceLineNo">527</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /**<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Sets up a path in test filesystem to be used by tests.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Creates a new directory if not already setup.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> if (dataTestDirOnTestFS != null) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.537"></a>
+<span class="sourceLineNo">538</span> + dataTestDirOnTestFS.toString());<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> /**<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> */<a name="line.546"></a>
+<span class="sourceLineNo">547</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.548"></a>
+<span class="sourceLineNo">549</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.549"></a>
+<span class="sourceLineNo">550</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.550"></a>
+<span class="sourceLineNo">551</span> //the working directory, and create a unique sub dir there<a name="line.551"></a>
+<span class="sourceLineNo">552</span> FileSystem fs = getTestFileSystem();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> Path newDataTestDir;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> String randomStr = UUID.randomUUID().toString();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> } else {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Path base = getBaseTestDirOnTestFS();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> newDataTestDir = new Path(base, randomStr);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return newDataTestDir;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Cleans the test data directory on the test filesystem.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * @return True if we removed the test dirs<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * @throws IOException<a name="line.570"></a>
+<span class="sourceLineNo">571</span> */<a name="line.571"></a>
+<span class="sourceLineNo">572</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (ret)<a name="line.574"></a>
+<span class="sourceLineNo">575</span> dataTestDirOnTestFS = null;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return ret;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> /**<a name="line.579"></a>
+<span class="sourceLineNo">580</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.580"></a>
+<span class="sourceLineNo">581</span> * @return True if we removed child<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * @throws IOException<a name="line.582"></a>
+<span class="sourceLineNo">583</span> */<a name="line.583"></a>
+<span class="sourceLineNo">584</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> return getTestFileSystem().delete(cpath, true);<a name="line.586"></a>
<span class="sourceLineNo">587</span> }<a name="line.587"></a>
<span class="sourceLineNo">588</span><a name="line.588"></a>
<span class="sourceLineNo">589</span> /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @return True if we removed child<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @throws IOException<a name="line.592"></a>
-<span class="sourceLineNo">593</span> */<a name="line.593"></a>
-<span class="sourceLineNo">594</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.595"></a>
-<span class="sourceLineNo">596</span> return getTestFileSystem().delete(cpath, true);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> /**<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * Start a minidfscluster.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @param servers How many DNs to start.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * @throws Exception<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @return The mini dfs cluster created.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> */<a name="line.605"></a>
-<span class="sourceLineNo">606</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.606"></a>
-<span class="sourceLineNo">607</span> return startMiniDFSCluster(servers, null);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * Start a minidfscluster.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * like HDFS block location verification.<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * datanodes will have the same host name.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param hosts hostnames DNs to run on.<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @throws Exception<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * @return The mini dfs cluster created.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> */<a name="line.620"></a>
-<span class="sourceLineNo">621</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.621"></a>
-<span class="sourceLineNo">622</span> throws Exception {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> if ( hosts != null && hosts.length != 0) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> } else {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> return startMiniDFSCluster(1, null);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span> * Start a minidfscluster.<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Can only create one.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * @param servers How many DNs to start.<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param hosts hostnames DNs to run on.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @throws Exception<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.636"></a>
-<span class="sourceLineNo">637</span> * @return The mini dfs cluster created.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> */<a name="line.638"></a>
-<span class="sourceLineNo">639</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.639"></a>
-<span class="sourceLineNo">640</span> throws Exception {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> private void setFs() throws IOException {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if(this.dfsCluster == null){<a name="line.645"></a>
-<span class="sourceLineNo">646</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> // re-enable this check with dfs<a name="line.652"></a>
-<span class="sourceLineNo">653</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.656"></a>
-<span class="sourceLineNo">657</span> throws Exception {<a name="line.657"></a>
-<span class="sourceLineNo">658</span> createDirsAndSetProperties();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.661"></a>
-<span class="sourceLineNo">662</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.662"></a>
-<span class="sourceLineNo">663</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.664"></a>
-<span class="sourceLineNo">665</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> TraceUtil.initTracer(conf);<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.669"></a>
-<span class="sourceLineNo">670</span> true, null, racks, hosts, null);<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> // Set this just-started cluster as our filesystem.<a name="line.672"></a>
-<span class="sourceLineNo">673</span> setFs();<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> // Wait for the cluster to be totally up<a name="line.675"></a>
-<span class="sourceLineNo">676</span> this.dfsCluster.waitClusterUp();<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //reset the test directory for test file system<a name="line.678"></a>
-<span class="sourceLineNo">679</span> dataTestDirOnTestFS = null;<a name="line.679"></a>
-<span class="sourceLineNo">680</span> String dataTestDir = getDataTestDir().toString();<a name="line.680"></a>
-<span class="sourceLineNo">681</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.681"></a>
-<span class="sourceLineNo">682</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.682"></a>
+<span class="sourceLineNo">590</span> * Start a minidfscluster.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @param servers How many DNs to start.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * @throws Exception<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return The mini dfs cluster created.<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> return startMiniDFSCluster(servers, null);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span> * Start a minidfscluster.<a name="line.601"></a>
+<span class="sourceLineNo">602</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * like HDFS block location verification.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * datanodes will have the same host name.<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * @param hosts hostnames DNs to run on.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> * @throws Exception<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @return The mini dfs cluster created.<a name="line.609"></a>
+<span class="sourceLineNo">610</span> */<a name="line.610"></a>
+<span class="sourceLineNo">611</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.611"></a>
+<span class="sourceLineNo">612</span> throws Exception {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> if ( hosts != null && hosts.length != 0) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } else {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return startMiniDFSCluster(1, null);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * Start a minidfscluster.<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Can only create one.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * @param servers How many DNs to start.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * @param hosts hostnames DNs to run on.<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * @throws Exception<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.626"></a>
+<span class="sourceLineNo">627</span> * @return The mini dfs cluster created.<a name="line.627"></a>
+<span class="sourceLineNo">628</span> */<a name="line.628"></a>
+<span class="sourceLineNo">629</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.629"></a>
+<span class="sourceLineNo">630</span> throws Exception {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private void setFs() throws IOException {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if(this.dfsCluster == null){<a name="line.635"></a>
+<span class="sourceLineNo">636</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.636"></a>
+<span class="sourceLineNo">637</span> return;<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span> // re-enable this check with dfs<a name="line.642"></a>
+<span class="sourceLineNo">643</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.643"></a>
+<span class="sourceLineNo">644</span> }<a name="line.644"></a>
+<span class="sourceLineNo">645</span><a name="line.645"></a>
+<span class="sourceLineNo">646</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.646"></a>
+<span class="sourceLineNo">647</span> throws Exception {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> createDirsAndSetProperties();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.651"></a>
+<span class="sourceLineNo">652</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.652"></a>
+<span class="sourceLineNo">653</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.653"></a>
+<span class="sourceLineNo">654</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.654"></a>
+<span class="sourceLineNo">655</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> TraceUtil.initTracer(conf);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.659"></a>
+<span class="sourceLineNo">660</span> true, null, racks, hosts, null);<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span> // Set this just-started cluster as our filesystem.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> setFs();<a name="line.663"></a>
+<span class="sourceLineNo">664</span><a name="line.664"></a>
+<span class="sourceLineNo">665</span> // Wait for the cluster to be totally up<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.dfsCluster.waitClusterUp();<a name="line.666"></a>
+<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">668</span> //reset the test directory for test file system<a name="line.668"></a>
+<span class="sourceLineNo">669</span> dataTestDirOnTestFS = null;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> String dataTestDir = getDataTestDir().toString();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.672"></a>
+<span class="sourceLineNo">673</span><a name="line.673"></a>
+<span class="sourceLineNo">674</span> return this.dfsCluster;<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> createDirsAndSetProperties();<a name="line.678"></a>
+<span class="sourceLineNo">679</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.679"></a>
+<span class="sourceLineNo">680</span> null, null, null);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> return dfsCluster;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> return this.dfsCluster;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> createDirsAndSetProperties();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.689"></a>
-<span class="sourceLineNo">690</span> null, null, null);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return dfsCluster;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> private void createDirsAndSetProperties() throws IOException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> setupClusterTestDir();<a name="line.696"></a>
-<span class="sourceLineNo">697</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.697"></a>
-<span class="sourceLineNo">698</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.698"></a>
-<span class="sourceLineNo">699</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.699"></a>
-<span class="sourceLineNo">700</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.700"></a>
-<span class="sourceLineNo">701</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.701"></a>
-<span class="sourceLineNo">702</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.702"></a>
-<span class="sourceLineNo">703</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.703"></a>
-<span class="sourceLineNo">704</span> enableShortCircuit();<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.706"></a>
-<span class="sourceLineNo">707</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.707"></a>
-<span class="sourceLineNo">708</span> new Path(root, "mapred-output-dir").toString());<a name="line.708"></a>
-<span class="sourceLineNo">709</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.709"></a>
-<span class="sourceLineNo">710</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.710"></a>
-<span class="sourceLineNo">711</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.711"></a>
-<span class="sourceLineNo">712</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.712"></a>
-<span class="sourceLineNo">713</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.713"></a>
-<span class="sourceLineNo">714</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> /**<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * This allows to specify this parameter on the command line.<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * If not set, default is true.<a name="line.721"></a>
-<span class="sourceLineNo">722</span> */<a name="line.722"></a>
-<span class="sourceLineNo">723</span> public boolean isReadShortCircuitOn(){<a name="line.723"></a>
-<span class="sourceLineNo">724</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.724"></a>
-<span class="sourceLineNo">725</span> String readOnProp = System.getProperty(propName);<a name="line.725"></a>
-<span class="sourceLineNo">726</span> if (readOnProp != null){<a name="line.726"></a>
-<span class="sourceLineNo">727</span> return Boolean.parseBoolean(readOnProp);<a name="line.727"></a>
-<span class="sourceLineNo">728</span> } else {<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return conf.getBoolean(propName, false);<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span><a name="line.732"></a>
-<span class="sourceLineNo">733</span> /** Enable the short circuit read, unless configured differently.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.734"></a>
-<span class="sourceLineNo">735</span> */<a name="line.735"></a>
-<span class="sourceLineNo">736</span> private void enableShortCircuit() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (isReadShortCircuitOn()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> String curUser = System.getProperty("user.name");<a name="line.738"></a>
-<span class="sourceLineNo">739</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> // read short circuit, for hdfs<a name="line.740"></a>
-<span class="sourceLineNo">741</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.741"></a>
-<span class="sourceLineNo">742</span> // read short circuit, for hbase<a name="line.742"></a>
-<span class="sourceLineNo">743</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.743"></a>
-<span class="sourceLineNo">744</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.744"></a>
-<span class="sourceLineNo">745</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> } else {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> LOG.info("read short circuit is OFF");<a name="line.747"></a>
-<span class="sourceLineNo">748</span> }<a name="line.748"></a>
-<span class="sourceLineNo">749</span> }<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> String path = getDataTestDir(relPath).toString();<a name="line.752"></a>
-<span class="sourceLineNo">753</span> System.setProperty(property, path);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> conf.set(property, path);<a name="line.754"></a>
-<span class="sourceLineNo">755</span> new File(path).mkdirs();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.756"></a>
-<span class="sourceLineNo">757</span> return path;<a name="line.757"></a>
-<span class="sourceLineNo">758</span> }<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * or does nothing.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * @throws IOException<a name="line.763"></a>
-<span class="sourceLineNo">764</span> */<a name="line.764"></a>
-<span class="sourceLineNo">765</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.dfsCluster != null) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.767"></a>
-<span class="sourceLineNo">768</span> this.dfsCluster.shutdown();<a name="line.768"></a>
-<span class="sourceLineNo">769</span> dfsCluster = null;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> dataTestDirOnTestFS = null;<a name="line.770"></a>
-<span class="sourceLineNo">771</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span> }<a name="line.773"></a>
-<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">684</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.684"></a>
+<span class="sourceLineNo">685</span> private void createDirsAndSetProperties() throws IOException {<a name="line.685"></a>
+<span class="sourceLineNo">686</span> setupClusterTestDir();<a name="line.686"></a>
+<span class="sourceLineNo">687</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.687"></a>
+<span class="sourceLineNo">688</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.689"></a>
+<span class="sourceLineNo">690</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.690"></a>
+<span class="sourceLineNo">691</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.691"></a>
+<span class="sourceLineNo">692</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.692"></a>
+<span class="sourceLineNo">693</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.693"></a>
+<span class="sourceLineNo">694</span> enableShortCircuit();<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.697"></a>
+<span class="sourceLineNo">698</span> new Path(root, "mapred-output-dir").toString());<a name="line.698"></a>
+<span class="sourceLineNo">699</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.699"></a>
+<span class="sourceLineNo">700</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.700"></a>
+<span class="sourceLineNo">701</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.701"></a>
+<span class="sourceLineNo">702</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.702"></a>
+<span class="sourceLineNo">703</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.703"></a>
+<span class="sourceLineNo">704</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.704"></a>
+<span class="sourceLineNo">705</span> }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span> /**<a name="line.708"></a>
+<span class="sourceLineNo">709</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.709"></a>
+<span class="sourceLineNo">710</span> * This allows to specify this parameter on the command line.<a name="line.710"></a>
+<span class="sourceLineNo">711</span> * If not set, default is true.<a name="line.711"></a>
+<span class="sourceLineNo">712</span> */<a name="line.712"></a>
+<span class="sourceLineNo">713</span> public boolean isReadShortCircuitOn(){<a name="line.713"></a>
+<span class="sourceLineNo">714</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.714"></a>
+<span class="sourceLineNo">715</span> String readOnProp = System.getProperty(propName);<a name="line.715"></a>
+<span class="sourceLineNo">716</span> if (readOnProp != null){<a name="line.716"></a>
+<span class="sourceLineNo">717</span> return Boolean.parseBoolean(readOnProp);<a name="line.717"></a>
+<span class="sourceLineNo">718</span> } else {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> return conf.getBoolean(propName, false);<a name="line.719"></a>
+<span class="sourceLineNo">720</span> }<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span><a name="line.722"></a>
+<span class="sourceLineNo">723</span> /** Enable the short circuit read, unless configured differently.<a name="line.723"></a>
+<span class="sourceLineNo">724</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.724"></a>
+<span class="sourceLineNo">725</span> */<a name="line.725"></a>
+<span class="sourceLineNo">726</span> private void enableShortCircuit() {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> if (isReadShortCircuitOn()) {<a name="line.727"></a>
+<span class="sourceLineNo">728</span> String curUser = System.getProperty("user.name");<a name="line.728"></a>
+<span class="sourceLineNo">729</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.729"></a>
+<span class="sourceLineNo">730</span> // read short circuit, for hdfs<a name="line.730"></a>
+<span class="sourceLineNo">731</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // read short circuit, for hbase<a name="line.732"></a>
+<span class="sourceLineNo">733</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.733"></a>
+<span class="sourceLineNo">734</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.734"></a>
+<span class="sourceLineNo">735</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.735"></a>
+<span class="sourceLineNo">736</span> } else {<a name="line.736"></a>
+<span class="sourceLineNo">737</span> LOG.info("read short circuit is OFF");<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> String path = getDataTestDir(relPath).toString();<a name="line.742"></a>
+<span class="sourceLineNo">743</span> System.setProperty(property, path);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> conf.set(property, path);<a name="line.744"></a>
+<span class="sourceLineNo">745</span> new File(path).mkdirs();<a name="line.745"></a>
+<span class="sourceLineNo">746</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.746"></a>
+<span class="sourceLineNo">747</span> return path;<a name="line.747"></a>
+<span class="sourceLineNo">748</span> }<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span> /**<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.751"></a>
+<span class="sourceLineNo">752</span> * or does nothing.<a name="line.752"></a>
+<span class="sourceLineNo">753</span> * @throws IOException<a name="line.753"></a>
+<span class="sourceLineNo">754</span> */<a name="line.754"></a>
+<span class="sourceLineNo">755</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (this.dfsCluster != null) {<a name="line.756"></a>
+<span class="sourceLineNo">757</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.757"></a>
+<span class="sourceLineNo">758</span> this.dfsCluster.shutdown();<a name="line.758"></a>
+<span class="sourceLineNo">759</span> dfsCluster = null;<a name="line.759"></a>
+<span class="sourceLineNo">760</span> dataTestDirOnTestFS = null;<a name="line.760"></a>
+<span class="sourceLineNo">761</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.761"></a>
+<span class="sourceLineNo">762</span> }<a name="line.762"></a>
+<span class="sourceLineNo">763</span> }<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> /**<a name="line.766"></a>
+<span class="sourceLineNo">767</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.767"></a>
+<span class="sourceLineNo">768</span> * @throws Exception<a name="line.768"></a>
+<span class="sourceLineNo">769</span> * @return Mini hbase cluster instance created.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.770"></a>
+<span class="sourceLineNo">771</span> */<a name="line.771"></a>
+<span class="sourceLineNo">772</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> return startMiniCluster(1, 1);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
<span class="sourceLineNo">775</span><a name="line.775"></a>
<span class="sourceLineNo">776</span> /**<a name="line.776"></a>
-<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.777"></a>
+<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.777"></a>
<span class="sourceLineNo">778</span> * @throws Exception<a name="line.778"></a>
<span class="sourceLineNo">779</span> * @return Mini hbase cluster instance created.<a name="line.779"></a>
<span class="sourceLineNo">780</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.780"></a>
<span class="sourceLineNo">781</span> */<a name="line.781"></a>
-<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> return startMiniCluster(1, 1);<a name="line.783"></a>
+<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.783"></a>
<span class="sourceLineNo">784</span> }<a name="line.784"></a>
<span class="sourceLineNo">785</span><a name="line.785"></a>
<span class="sourceLineNo">786</span> /**<a name="line.786"></a>
-<span class="sourceLineNo">787</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.787"></a>
-<span class="sourceLineNo">788</span> * @throws Exception<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @return Mini hbase cluster instance created.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span> /**<a name="line.796"></a>
-<span class="sourceLineNo">797</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.797"></a>
-<span class="sourceLineNo">798</span> * Set the <code>create</code> flag to create root or data directory path or not<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * (will overwrite if dir already exists)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> * @throws Exception<a name="line.800"></a>
-<span class="sourceLineNo">801</span> * @return Mini hbase cluster instance created.<a name="line.801"></a>
-<span class="sourceLineNo">802</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.802"></a>
-<span class="sourceLineNo">803</span>
<TRUNCATED>
[05/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
index 869f6a1..3b08b86 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
@@ -341,2502 +341,2502 @@
<span class="sourceLineNo">333</span> // a hbase checksum verification failure will cause unit tests to fail<a name="line.333"></a>
<span class="sourceLineNo">334</span> ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.334"></a>
<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> // if conf is provided, prevent contention for ports if other hbase thread(s) are running<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (conf != null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.338"></a>
-<span class="sourceLineNo">339</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> LOG.debug("Config property {} changed to -1", HConstants.MASTER_INFO_PORT);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> LOG.debug("Config property {} changed to -1", HConstants.REGIONSERVER_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> // Save this for when setting default file:// breaks things<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // Every cluster is a local cluster until we start DFS<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Note that conf could be null, but this.conf will not be<a name="line.354"></a>
-<span class="sourceLineNo">355</span> String dataTestDir = getDataTestDir().toString();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.conf.set("fs.defaultFS","file:///");<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> /**<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @return a normal HBaseTestingUtility<a name="line.364"></a>
-<span class="sourceLineNo">365</span> */<a name="line.365"></a>
-<span class="sourceLineNo">366</span> @Deprecated<a name="line.366"></a>
-<span class="sourceLineNo">367</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return new HBaseTestingUtility();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return a normal HBaseTestingUtility<a name="line.373"></a>
-<span class="sourceLineNo">374</span> */<a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Deprecated<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return new HBaseTestingUtility(c);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> */<a name="line.382"></a>
-<span class="sourceLineNo">383</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> closeRegionAndWAL((HRegion)r);<a name="line.384"></a>
+<span class="sourceLineNo">336</span> // Save this for when setting default file:// breaks things<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Every cluster is a local cluster until we start DFS<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Note that conf could be null, but this.conf will not be<a name="line.340"></a>
+<span class="sourceLineNo">341</span> String dataTestDir = getDataTestDir().toString();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> this.conf.set("fs.defaultFS","file:///");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // If the value for random ports isn't set set it to true, thus making<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // tests opt-out for random port assignment<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.conf.setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS,<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true));<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> /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return a normal HBaseTestingUtility<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Deprecated<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return new HBaseTestingUtility();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @return a normal HBaseTestingUtility<a name="line.363"></a>
+<span class="sourceLineNo">364</span> */<a name="line.364"></a>
+<span class="sourceLineNo">365</span> @Deprecated<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> return new HBaseTestingUtility(c);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.371"></a>
+<span class="sourceLineNo">372</span> */<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> closeRegionAndWAL((HRegion)r);<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>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (r == null) return;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> r.close();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (r.getWAL() == null) return;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> r.getWAL().close();<a name="line.384"></a>
<span class="sourceLineNo">385</span> }<a name="line.385"></a>
<span class="sourceLineNo">386</span><a name="line.386"></a>
<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> */<a name="line.389"></a>
-<span class="sourceLineNo">390</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (r == null) return;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> r.close();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (r.getWAL() == null) return;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> r.getWAL().close();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * you use the returned Configuration since {@link Connection} instances<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * make a copy and use that. Do<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return Instance of Configuration.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> @Override<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public Configuration getConfiguration() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return super.getConfiguration();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> this.hbaseCluster = hbaseCluster;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * Give it a random name so can have many concurrent tests running if<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * System property, as it's what minidfscluster bases<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * instances -- another instance could grab the temporary<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * single instance only is how the minidfscluster works.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * We also create the underlying directory for<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.429"></a>
-<span class="sourceLineNo">430</span> *<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @return The calculated data test build directory, if newly-created.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected Path setupDataTestDir() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Path testPath = super.setupDataTestDir();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (null == testPath) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">388</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * you use the returned Configuration since {@link Connection} instances<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * make a copy and use that. Do<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.395"></a>
+<span class="sourceLineNo">396</span> * @return Instance of Configuration.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span> public Configuration getConfiguration() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return super.getConfiguration();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> this.hbaseCluster = hbaseCluster;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Give it a random name so can have many concurrent tests running if<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * System property, as it's what minidfscluster bases<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * instances -- another instance could grab the temporary<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * single instance only is how the minidfscluster works.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> *<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * We also create the underlying directory for<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.419"></a>
+<span class="sourceLineNo">420</span> *<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @return The calculated data test build directory, if newly-created.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> */<a name="line.422"></a>
+<span class="sourceLineNo">423</span> @Override<a name="line.423"></a>
+<span class="sourceLineNo">424</span> protected Path setupDataTestDir() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Path testPath = super.setupDataTestDir();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (null == testPath) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> createSubDirAndSystemProperty(<a name="line.430"></a>
+<span class="sourceLineNo">431</span> "hadoop.log.dir",<a name="line.431"></a>
+<span class="sourceLineNo">432</span> testPath, "hadoop-log-dir");<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // we want our own value to ensure uniqueness on the same machine<a name="line.435"></a>
+<span class="sourceLineNo">436</span> createSubDirAndSystemProperty(<a name="line.436"></a>
+<span class="sourceLineNo">437</span> "hadoop.tmp.dir",<a name="line.437"></a>
+<span class="sourceLineNo">438</span> testPath, "hadoop-tmp-dir");<a name="line.438"></a>
<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> createSubDirAndSystemProperty(<a name="line.440"></a>
-<span class="sourceLineNo">441</span> "hadoop.log.dir",<a name="line.441"></a>
-<span class="sourceLineNo">442</span> testPath, "hadoop-log-dir");<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // we want our own value to ensure uniqueness on the same machine<a name="line.445"></a>
-<span class="sourceLineNo">446</span> createSubDirAndSystemProperty(<a name="line.446"></a>
-<span class="sourceLineNo">447</span> "hadoop.tmp.dir",<a name="line.447"></a>
-<span class="sourceLineNo">448</span> testPath, "hadoop-tmp-dir");<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.450"></a>
-<span class="sourceLineNo">451</span> createSubDir(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> "mapreduce.cluster.local.dir",<a name="line.452"></a>
-<span class="sourceLineNo">453</span> testPath, "mapred-local-dir");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return testPath;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private void createSubDirAndSystemProperty(<a name="line.458"></a>
-<span class="sourceLineNo">459</span> String propertyName, Path parent, String subDirName){<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> String sysValue = System.getProperty(propertyName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (sysValue != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // There is already a value set. So we do nothing but hope<a name="line.464"></a>
-<span class="sourceLineNo">465</span> // that there will be no conflicts<a name="line.465"></a>
-<span class="sourceLineNo">466</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.466"></a>
-<span class="sourceLineNo">467</span> sysValue + " so I do NOT create it in " + parent);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> String confValue = conf.get(propertyName);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.warn(<a name="line.470"></a>
-<span class="sourceLineNo">471</span> propertyName + " property value differs in configuration and system: "+<a name="line.471"></a>
-<span class="sourceLineNo">472</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.472"></a>
-<span class="sourceLineNo">473</span> " Erasing configuration value by system value."<a name="line.473"></a>
-<span class="sourceLineNo">474</span> );<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> conf.set(propertyName, sysValue);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.478"></a>
-<span class="sourceLineNo">479</span> createSubDir(propertyName, parent, subDirName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * for the test filesystem by default<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @see #setupDataTestDirOnTestFS()<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @see #getTestFileSystem()<a name="line.488"></a>
+<span class="sourceLineNo">440</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.440"></a>
+<span class="sourceLineNo">441</span> createSubDir(<a name="line.441"></a>
+<span class="sourceLineNo">442</span> "mapreduce.cluster.local.dir",<a name="line.442"></a>
+<span class="sourceLineNo">443</span> testPath, "mapred-local-dir");<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> return testPath;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> private void createSubDirAndSystemProperty(<a name="line.448"></a>
+<span class="sourceLineNo">449</span> String propertyName, Path parent, String subDirName){<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> String sysValue = System.getProperty(propertyName);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (sysValue != null) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // There is already a value set. So we do nothing but hope<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // that there will be no conflicts<a name="line.455"></a>
+<span class="sourceLineNo">456</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.456"></a>
+<span class="sourceLineNo">457</span> sysValue + " so I do NOT create it in " + parent);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> String confValue = conf.get(propertyName);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.459"></a>
+<span class="sourceLineNo">460</span> LOG.warn(<a name="line.460"></a>
+<span class="sourceLineNo">461</span> propertyName + " property value differs in configuration and system: "+<a name="line.461"></a>
+<span class="sourceLineNo">462</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.462"></a>
+<span class="sourceLineNo">463</span> " Erasing configuration value by system value."<a name="line.463"></a>
+<span class="sourceLineNo">464</span> );<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> conf.set(propertyName, sysValue);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> } else {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.468"></a>
+<span class="sourceLineNo">469</span> createSubDir(propertyName, parent, subDirName);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * for the test filesystem by default<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @see #setupDataTestDirOnTestFS()<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @see #getTestFileSystem()<a name="line.478"></a>
+<span class="sourceLineNo">479</span> */<a name="line.479"></a>
+<span class="sourceLineNo">480</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> FileSystem fs = getTestFileSystem();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> /**<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return META table descriptor<a name="line.486"></a>
+<span class="sourceLineNo">487</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.488"></a>
<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> FileSystem fs = getTestFileSystem();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.492"></a>
+<span class="sourceLineNo">490</span> @Deprecated<a name="line.490"></a>
+<span class="sourceLineNo">491</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.492"></a>
<span class="sourceLineNo">493</span> }<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
<span class="sourceLineNo">496</span> * @return META table descriptor<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.498"></a>
-<span class="sourceLineNo">499</span> */<a name="line.499"></a>
-<span class="sourceLineNo">500</span> @Deprecated<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @return META table descriptor<a name="line.506"></a>
-<span class="sourceLineNo">507</span> */<a name="line.507"></a>
-<span class="sourceLineNo">508</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> try {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> } catch (IOException e) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * if the test relies on it.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * @return a unique path in the test filesystem<a name="line.520"></a>
-<span class="sourceLineNo">521</span> */<a name="line.521"></a>
-<span class="sourceLineNo">522</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (dataTestDirOnTestFS == null) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> setupDataTestDirOnTestFS();<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> return dataTestDirOnTestFS;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * if the test relies on it.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * @return a unique path in the test filesystem<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.535"></a>
-<span class="sourceLineNo">536</span> */<a name="line.536"></a>
-<span class="sourceLineNo">537</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * Sets up a path in test filesystem to be used by tests.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Creates a new directory if not already setup.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (dataTestDirOnTestFS != null) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.547"></a>
-<span class="sourceLineNo">548</span> + dataTestDirOnTestFS.toString());<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> /**<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.555"></a>
-<span class="sourceLineNo">556</span> */<a name="line.556"></a>
-<span class="sourceLineNo">557</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.558"></a>
-<span class="sourceLineNo">559</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.559"></a>
-<span class="sourceLineNo">560</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.560"></a>
-<span class="sourceLineNo">561</span> //the working directory, and create a unique sub dir there<a name="line.561"></a>
-<span class="sourceLineNo">562</span> FileSystem fs = getTestFileSystem();<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Path newDataTestDir;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> String randomStr = UUID.randomUUID().toString();<a name="line.564"></a>
-<span class="sourceLineNo">565</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } else {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path base = getBaseTestDirOnTestFS();<a name="line.570"></a>
-<span class="sourceLineNo">571</span> newDataTestDir = new Path(base, randomStr);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> return newDataTestDir;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * Cleans the test data directory on the test filesystem.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return True if we removed the test dirs<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * @throws IOException<a name="line.580"></a>
-<span class="sourceLineNo">581</span> */<a name="line.581"></a>
-<span class="sourceLineNo">582</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (ret)<a name="line.584"></a>
-<span class="sourceLineNo">585</span> dataTestDirOnTestFS = null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return ret;<a name="line.586"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> } catch (IOException e) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * if the test relies on it.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return a unique path in the test filesystem<a name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (dataTestDirOnTestFS == null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> setupDataTestDirOnTestFS();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> return dataTestDirOnTestFS;<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * if the test relies on it.<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return a unique path in the test filesystem<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.525"></a>
+<span class="sourceLineNo">526</span> */<a name="line.526"></a>
+<span class="sourceLineNo">527</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /**<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Sets up a path in test filesystem to be used by tests.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Creates a new directory if not already setup.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> if (dataTestDirOnTestFS != null) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.537"></a>
+<span class="sourceLineNo">538</span> + dataTestDirOnTestFS.toString());<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> /**<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> */<a name="line.546"></a>
+<span class="sourceLineNo">547</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.548"></a>
+<span class="sourceLineNo">549</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.549"></a>
+<span class="sourceLineNo">550</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.550"></a>
+<span class="sourceLineNo">551</span> //the working directory, and create a unique sub dir there<a name="line.551"></a>
+<span class="sourceLineNo">552</span> FileSystem fs = getTestFileSystem();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> Path newDataTestDir;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> String randomStr = UUID.randomUUID().toString();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> } else {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Path base = getBaseTestDirOnTestFS();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> newDataTestDir = new Path(base, randomStr);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return newDataTestDir;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Cleans the test data directory on the test filesystem.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * @return True if we removed the test dirs<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * @throws IOException<a name="line.570"></a>
+<span class="sourceLineNo">571</span> */<a name="line.571"></a>
+<span class="sourceLineNo">572</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (ret)<a name="line.574"></a>
+<span class="sourceLineNo">575</span> dataTestDirOnTestFS = null;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return ret;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> /**<a name="line.579"></a>
+<span class="sourceLineNo">580</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.580"></a>
+<span class="sourceLineNo">581</span> * @return True if we removed child<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * @throws IOException<a name="line.582"></a>
+<span class="sourceLineNo">583</span> */<a name="line.583"></a>
+<span class="sourceLineNo">584</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> return getTestFileSystem().delete(cpath, true);<a name="line.586"></a>
<span class="sourceLineNo">587</span> }<a name="line.587"></a>
<span class="sourceLineNo">588</span><a name="line.588"></a>
<span class="sourceLineNo">589</span> /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @return True if we removed child<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @throws IOException<a name="line.592"></a>
-<span class="sourceLineNo">593</span> */<a name="line.593"></a>
-<span class="sourceLineNo">594</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.595"></a>
-<span class="sourceLineNo">596</span> return getTestFileSystem().delete(cpath, true);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> /**<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * Start a minidfscluster.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @param servers How many DNs to start.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * @throws Exception<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @return The mini dfs cluster created.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> */<a name="line.605"></a>
-<span class="sourceLineNo">606</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.606"></a>
-<span class="sourceLineNo">607</span> return startMiniDFSCluster(servers, null);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * Start a minidfscluster.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * like HDFS block location verification.<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * datanodes will have the same host name.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param hosts hostnames DNs to run on.<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @throws Exception<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * @return The mini dfs cluster created.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> */<a name="line.620"></a>
-<span class="sourceLineNo">621</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.621"></a>
-<span class="sourceLineNo">622</span> throws Exception {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> if ( hosts != null && hosts.length != 0) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> } else {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> return startMiniDFSCluster(1, null);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span> * Start a minidfscluster.<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Can only create one.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * @param servers How many DNs to start.<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param hosts hostnames DNs to run on.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @throws Exception<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.636"></a>
-<span class="sourceLineNo">637</span> * @return The mini dfs cluster created.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> */<a name="line.638"></a>
-<span class="sourceLineNo">639</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.639"></a>
-<span class="sourceLineNo">640</span> throws Exception {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> private void setFs() throws IOException {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if(this.dfsCluster == null){<a name="line.645"></a>
-<span class="sourceLineNo">646</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> // re-enable this check with dfs<a name="line.652"></a>
-<span class="sourceLineNo">653</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.656"></a>
-<span class="sourceLineNo">657</span> throws Exception {<a name="line.657"></a>
-<span class="sourceLineNo">658</span> createDirsAndSetProperties();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.661"></a>
-<span class="sourceLineNo">662</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.662"></a>
-<span class="sourceLineNo">663</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.664"></a>
-<span class="sourceLineNo">665</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> TraceUtil.initTracer(conf);<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.669"></a>
-<span class="sourceLineNo">670</span> true, null, racks, hosts, null);<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> // Set this just-started cluster as our filesystem.<a name="line.672"></a>
-<span class="sourceLineNo">673</span> setFs();<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> // Wait for the cluster to be totally up<a name="line.675"></a>
-<span class="sourceLineNo">676</span> this.dfsCluster.waitClusterUp();<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //reset the test directory for test file system<a name="line.678"></a>
-<span class="sourceLineNo">679</span> dataTestDirOnTestFS = null;<a name="line.679"></a>
-<span class="sourceLineNo">680</span> String dataTestDir = getDataTestDir().toString();<a name="line.680"></a>
-<span class="sourceLineNo">681</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.681"></a>
-<span class="sourceLineNo">682</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.682"></a>
+<span class="sourceLineNo">590</span> * Start a minidfscluster.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @param servers How many DNs to start.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * @throws Exception<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return The mini dfs cluster created.<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> return startMiniDFSCluster(servers, null);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span> * Start a minidfscluster.<a name="line.601"></a>
+<span class="sourceLineNo">602</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * like HDFS block location verification.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * datanodes will have the same host name.<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * @param hosts hostnames DNs to run on.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> * @throws Exception<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @return The mini dfs cluster created.<a name="line.609"></a>
+<span class="sourceLineNo">610</span> */<a name="line.610"></a>
+<span class="sourceLineNo">611</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.611"></a>
+<span class="sourceLineNo">612</span> throws Exception {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> if ( hosts != null && hosts.length != 0) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } else {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return startMiniDFSCluster(1, null);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * Start a minidfscluster.<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Can only create one.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * @param servers How many DNs to start.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * @param hosts hostnames DNs to run on.<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * @throws Exception<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.626"></a>
+<span class="sourceLineNo">627</span> * @return The mini dfs cluster created.<a name="line.627"></a>
+<span class="sourceLineNo">628</span> */<a name="line.628"></a>
+<span class="sourceLineNo">629</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.629"></a>
+<span class="sourceLineNo">630</span> throws Exception {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private void setFs() throws IOException {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if(this.dfsCluster == null){<a name="line.635"></a>
+<span class="sourceLineNo">636</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.636"></a>
+<span class="sourceLineNo">637</span> return;<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span> // re-enable this check with dfs<a name="line.642"></a>
+<span class="sourceLineNo">643</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.643"></a>
+<span class="sourceLineNo">644</span> }<a name="line.644"></a>
+<span class="sourceLineNo">645</span><a name="line.645"></a>
+<span class="sourceLineNo">646</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.646"></a>
+<span class="sourceLineNo">647</span> throws Exception {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> createDirsAndSetProperties();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.651"></a>
+<span class="sourceLineNo">652</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.652"></a>
+<span class="sourceLineNo">653</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.653"></a>
+<span class="sourceLineNo">654</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.654"></a>
+<span class="sourceLineNo">655</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> TraceUtil.initTracer(conf);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.659"></a>
+<span class="sourceLineNo">660</span> true, null, racks, hosts, null);<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span> // Set this just-started cluster as our filesystem.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> setFs();<a name="line.663"></a>
+<span class="sourceLineNo">664</span><a name="line.664"></a>
+<span class="sourceLineNo">665</span> // Wait for the cluster to be totally up<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.dfsCluster.waitClusterUp();<a name="line.666"></a>
+<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">668</span> //reset the test directory for test file system<a name="line.668"></a>
+<span class="sourceLineNo">669</span> dataTestDirOnTestFS = null;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> String dataTestDir = getDataTestDir().toString();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.672"></a>
+<span class="sourceLineNo">673</span><a name="line.673"></a>
+<span class="sourceLineNo">674</span> return this.dfsCluster;<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> createDirsAndSetProperties();<a name="line.678"></a>
+<span class="sourceLineNo">679</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.679"></a>
+<span class="sourceLineNo">680</span> null, null, null);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> return dfsCluster;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> return this.dfsCluster;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> createDirsAndSetProperties();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.689"></a>
-<span class="sourceLineNo">690</span> null, null, null);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return dfsCluster;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> private void createDirsAndSetProperties() throws IOException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> setupClusterTestDir();<a name="line.696"></a>
-<span class="sourceLineNo">697</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.697"></a>
-<span class="sourceLineNo">698</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.698"></a>
-<span class="sourceLineNo">699</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.699"></a>
-<span class="sourceLineNo">700</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.700"></a>
-<span class="sourceLineNo">701</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.701"></a>
-<span class="sourceLineNo">702</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.702"></a>
-<span class="sourceLineNo">703</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.703"></a>
-<span class="sourceLineNo">704</span> enableShortCircuit();<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.706"></a>
-<span class="sourceLineNo">707</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.707"></a>
-<span class="sourceLineNo">708</span> new Path(root, "mapred-output-dir").toString());<a name="line.708"></a>
-<span class="sourceLineNo">709</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.709"></a>
-<span class="sourceLineNo">710</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.710"></a>
-<span class="sourceLineNo">711</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.711"></a>
-<span class="sourceLineNo">712</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.712"></a>
-<span class="sourceLineNo">713</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.713"></a>
-<span class="sourceLineNo">714</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> /**<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * This allows to specify this parameter on the command line.<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * If not set, default is true.<a name="line.721"></a>
-<span class="sourceLineNo">722</span> */<a name="line.722"></a>
-<span class="sourceLineNo">723</span> public boolean isReadShortCircuitOn(){<a name="line.723"></a>
-<span class="sourceLineNo">724</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.724"></a>
-<span class="sourceLineNo">725</span> String readOnProp = System.getProperty(propName);<a name="line.725"></a>
-<span class="sourceLineNo">726</span> if (readOnProp != null){<a name="line.726"></a>
-<span class="sourceLineNo">727</span> return Boolean.parseBoolean(readOnProp);<a name="line.727"></a>
-<span class="sourceLineNo">728</span> } else {<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return conf.getBoolean(propName, false);<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span><a name="line.732"></a>
-<span class="sourceLineNo">733</span> /** Enable the short circuit read, unless configured differently.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.734"></a>
-<span class="sourceLineNo">735</span> */<a name="line.735"></a>
-<span class="sourceLineNo">736</span> private void enableShortCircuit() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (isReadShortCircuitOn()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> String curUser = System.getProperty("user.name");<a name="line.738"></a>
-<span class="sourceLineNo">739</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> // read short circuit, for hdfs<a name="line.740"></a>
-<span class="sourceLineNo">741</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.741"></a>
-<span class="sourceLineNo">742</span> // read short circuit, for hbase<a name="line.742"></a>
-<span class="sourceLineNo">743</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.743"></a>
-<span class="sourceLineNo">744</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.744"></a>
-<span class="sourceLineNo">745</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> } else {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> LOG.info("read short circuit is OFF");<a name="line.747"></a>
-<span class="sourceLineNo">748</span> }<a name="line.748"></a>
-<span class="sourceLineNo">749</span> }<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> String path = getDataTestDir(relPath).toString();<a name="line.752"></a>
-<span class="sourceLineNo">753</span> System.setProperty(property, path);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> conf.set(property, path);<a name="line.754"></a>
-<span class="sourceLineNo">755</span> new File(path).mkdirs();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.756"></a>
-<span class="sourceLineNo">757</span> return path;<a name="line.757"></a>
-<span class="sourceLineNo">758</span> }<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * or does nothing.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * @throws IOException<a name="line.763"></a>
-<span class="sourceLineNo">764</span> */<a name="line.764"></a>
-<span class="sourceLineNo">765</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.dfsCluster != null) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.767"></a>
-<span class="sourceLineNo">768</span> this.dfsCluster.shutdown();<a name="line.768"></a>
-<span class="sourceLineNo">769</span> dfsCluster = null;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> dataTestDirOnTestFS = null;<a name="line.770"></a>
-<span class="sourceLineNo">771</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span> }<a name="line.773"></a>
-<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">684</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.684"></a>
+<span class="sourceLineNo">685</span> private void createDirsAndSetProperties() throws IOException {<a name="line.685"></a>
+<span class="sourceLineNo">686</span> setupClusterTestDir();<a name="line.686"></a>
+<span class="sourceLineNo">687</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.687"></a>
+<span class="sourceLineNo">688</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.689"></a>
+<span class="sourceLineNo">690</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.690"></a>
+<span class="sourceLineNo">691</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.691"></a>
+<span class="sourceLineNo">692</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.692"></a>
+<span class="sourceLineNo">693</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.693"></a>
+<span class="sourceLineNo">694</span> enableShortCircuit();<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.697"></a>
+<span class="sourceLineNo">698</span> new Path(root, "mapred-output-dir").toString());<a name="line.698"></a>
+<span class="sourceLineNo">699</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.699"></a>
+<span class="sourceLineNo">700</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.700"></a>
+<span class="sourceLineNo">701</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.701"></a>
+<span class="sourceLineNo">702</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.702"></a>
+<span class="sourceLineNo">703</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.703"></a>
+<span class="sourceLineNo">704</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.704"></a>
+<span class="sourceLineNo">705</span> }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span> /**<a name="line.708"></a>
+<span class="sourceLineNo">709</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.709"></a>
+<span class="sourceLineNo">710</span> * This allows to specify this parameter on the command line.<a name="line.710"></a>
+<span class="sourceLineNo">711</span> * If not set, default is true.<a name="line.711"></a>
+<span class="sourceLineNo">712</span> */<a name="line.712"></a>
+<span class="sourceLineNo">713</span> public boolean isReadShortCircuitOn(){<a name="line.713"></a>
+<span class="sourceLineNo">714</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.714"></a>
+<span class="sourceLineNo">715</span> String readOnProp = System.getProperty(propName);<a name="line.715"></a>
+<span class="sourceLineNo">716</span> if (readOnProp != null){<a name="line.716"></a>
+<span class="sourceLineNo">717</span> return Boolean.parseBoolean(readOnProp);<a name="line.717"></a>
+<span class="sourceLineNo">718</span> } else {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> return conf.getBoolean(propName, false);<a name="line.719"></a>
+<span class="sourceLineNo">720</span> }<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span><a name="line.722"></a>
+<span class="sourceLineNo">723</span> /** Enable the short circuit read, unless configured differently.<a name="line.723"></a>
+<span class="sourceLineNo">724</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.724"></a>
+<span class="sourceLineNo">725</span> */<a name="line.725"></a>
+<span class="sourceLineNo">726</span> private void enableShortCircuit() {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> if (isReadShortCircuitOn()) {<a name="line.727"></a>
+<span class="sourceLineNo">728</span> String curUser = System.getProperty("user.name");<a name="line.728"></a>
+<span class="sourceLineNo">729</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.729"></a>
+<span class="sourceLineNo">730</span> // read short circuit, for hdfs<a name="line.730"></a>
+<span class="sourceLineNo">731</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // read short circuit, for hbase<a name="line.732"></a>
+<span class="sourceLineNo">733</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.733"></a>
+<span class="sourceLineNo">734</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.734"></a>
+<span class="sourceLineNo">735</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.735"></a>
+<span class="sourceLineNo">736</span> } else {<a name="line.736"></a>
+<span class="sourceLineNo">737</span> LOG.info("read short circuit is OFF");<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> String path = getDataTestDir(relPath).toString();<a name="line.742"></a>
+<span class="sourceLineNo">743</span> System.setProperty(property, path);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> conf.set(property, path);<a name="line.744"></a>
+<span class="sourceLineNo">745</span> new File(path).mkdirs();<a name="line.745"></a>
+<span class="sourceLineNo">746</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.746"></a>
+<span class="sourceLineNo">747</span> return path;<a name="line.747"></a>
+<span class="sourceLineNo">748</span> }<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span> /**<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.751"></a>
+<span class="sourceLineNo">752</span> * or does nothing.<a name="line.752"></a>
+<span class="sourceLineNo">753</span> * @throws IOException<a name="line.753"></a>
+<span class="sourceLineNo">754</span> */<a name="line.754"></a>
+<span class="sourceLineNo">755</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (this.dfsCluster != null) {<a name="line.756"></a>
+<span class="sourceLineNo">757</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.757"></a>
+<span class="sourceLineNo">758</span> this.dfsCluster.shutdown();<a name="line.758"></a>
+<span class="sourceLineNo">759</span> dfsCluster = null;<a name="line.759"></a>
+<span class="sourceLineNo">760</span> dataTestDirOnTestFS = null;<a name="line.760"></a>
+<span class="sourceLineNo">761</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.761"></a>
+<span class="sourceLineNo">762</span> }<a name="line.762"></a>
+<span class="sourceLineNo">763</span> }<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> /**<a name="line.766"></a>
+<span class="sourceLineNo">767</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.767"></a>
+<span class="sourceLineNo">768</span> * @throws Exception<a name="line.768"></a>
+<span class="sourceLineNo">769</span> * @return Mini hbase cluster instance created.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.770"></a>
+<span class="sourceLineNo">771</span> */<a name="line.771"></a>
+<span class="sourceLineNo">772</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> return startMiniCluster(1, 1);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
<span class="sourceLineNo">775</span><a name="line.775"></a>
<span class="sourceLineNo">776</span> /**<a name="line.776"></a>
-<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.777"></a>
+<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.777"></a>
<span class="sourceLineNo">778</span> * @throws Exception<a name="line.778"></a>
<span class="sourceLineNo">779</span> * @return Mini hbase cluster instance created.<a name="line.779"></a>
<span class="sourceLineNo">780</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.780"></a>
<span class="sourceLineNo">781</span> */<a name="line.781"></a>
-<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> return startMiniCluster(1, 1);<a name="line.783"></a>
+<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.783"></a>
<span class="sourceLineNo">784</span> }<a name="line.784"></a>
<span class="sourceLineNo">785</span><a name="line.785"></a>
<span class="sourceLineNo">786</span> /**<a name="line.786"></a>
-<span class="sourceLineNo">787</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.787"></a>
-<span class="sourceLineNo">788</span> * @throws Exception<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @return Mini hbase cluster instance created.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span> /**<a name="line.796"></a>
-<span class="sourceLineNo">797</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.797"></a>
-<span class="sourceLineNo">798</span> * Set the <code>create</code> flag to create root or data directory path or not<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * (will overwrite if dir already exists)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> * @throws Exception<a name="line.800"></a>
-<span class="sourceLineNo">801</span> * @return Mini hbase cluster instance created.<a name="line.801"></a>
-<span class="sourceLineNo">802</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.802"></a>
-<span class="sourceLineN
<TRUNCATED>
[24/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
[02/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
index c9fbc98..af2e5b1 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
@@ -116,811 +116,805 @@
<span class="sourceLineNo">108</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.108"></a>
<span class="sourceLineNo">109</span> throws IOException, InterruptedException {<a name="line.109"></a>
<span class="sourceLineNo">110</span> super(conf);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> conf.set(HConstants.MASTER_INFO_PORT, "0");<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> // Hadoop 2<a name="line.118"></a>
-<span class="sourceLineNo">119</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> this.initialClusterStatus = getClusterStatus();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> public Configuration getConfiguration() {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return this.conf;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * the FileSystem system exit hook does.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> */<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> private Thread shutdownThread = null;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> private User user = null;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.143"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> // Hadoop 2<a name="line.112"></a>
+<span class="sourceLineNo">113</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> this.initialClusterStatus = getClusterStatus();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> public Configuration getConfiguration() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> return this.conf;<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> /**<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * the FileSystem system exit hook does.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> private Thread shutdownThread = null;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> private User user = null;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> */<a name="line.136"></a>
+<span class="sourceLineNo">137</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throws IOException, InterruptedException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> super(conf);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> this.user = User.getCurrent();<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> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.145"></a>
-<span class="sourceLineNo">146</span> throws IOException, InterruptedException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> super(conf);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.user = User.getCurrent();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /*<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param c<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @param currentfs We return this if we did not make a new one.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @throws IOException<a name="line.156"></a>
-<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span> protected void handleReportForDutyResponse(<a name="line.160"></a>
-<span class="sourceLineNo">161</span> final RegionServerStartupResponse c) throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> super.handleReportForDutyResponse(c);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // Run this thread to shutdown our filesystem on way out.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<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> @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span> public void run() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public Object run() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> runRegionServer();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return null;<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> } catch (Throwable t) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> LOG.error("Exception in run", t);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> } finally {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Run this on the way out.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (this.shutdownThread != null) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.shutdownThread.start();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> private void runRegionServer() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> super.run();<a name="line.189"></a>
+<span class="sourceLineNo">145</span> /*<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @param c<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @param currentfs We return this if we did not make a new one.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @throws IOException<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
+<span class="sourceLineNo">154</span> protected void handleReportForDutyResponse(<a name="line.154"></a>
+<span class="sourceLineNo">155</span> final RegionServerStartupResponse c) throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> super.handleReportForDutyResponse(c);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> // Run this thread to shutdown our filesystem on way out.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public void run() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public Object run() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> runRegionServer();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return null;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> });<a name="line.170"></a>
+<span class="sourceLineNo">171</span> } catch (Throwable t) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.error("Exception in run", t);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> } finally {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Run this on the way out.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (this.shutdownThread != null) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> this.shutdownThread.start();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void runRegionServer() {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> super.run();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span> protected void kill() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> killedServers.add(getServerName());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> super.kill();<a name="line.189"></a>
<span class="sourceLineNo">190</span> }<a name="line.190"></a>
<span class="sourceLineNo">191</span><a name="line.191"></a>
<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> protected void kill() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> killedServers.add(getServerName());<a name="line.194"></a>
-<span class="sourceLineNo">195</span> super.kill();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public void abort(final String reason, final Throwable cause) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public Object run() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> abortRegionServer(reason, cause);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return null;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> });<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> super.abort(reason, cause);<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">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * Alternate shutdown hook.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> private final FileSystem fs;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> super("Shutdown of " + fs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.fs = fs;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public void run() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> try {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.fs.close();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> } catch (NullPointerException npe) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.230"></a>
-<span class="sourceLineNo">231</span> } catch (IOException e) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.warn("Running hook", e);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Class<? extends HMaster> masterClass,<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.239"></a>
-<span class="sourceLineNo">240</span> throws IOException, InterruptedException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (masterClass == null){<a name="line.242"></a>
-<span class="sourceLineNo">243</span> masterClass = HMaster.class;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (regionserverClass == null){<a name="line.245"></a>
-<span class="sourceLineNo">246</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> // start up a LocalHBaseCluster<a name="line.249"></a>
-<span class="sourceLineNo">250</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.250"></a>
-<span class="sourceLineNo">251</span> masterClass, regionserverClass);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> // manually add the regionservers as other users<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (rsPorts != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ".hfs."+index++);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> hbaseCluster.startup();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> shutdown();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> throw e;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> } catch (Throwable t) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> LOG.error("Error starting cluster", t);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> shutdown();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new IOException("Shutting down", t);<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>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> this.startRegionServer();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> LOG.info("Killing " + server.toString());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> @Override<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public boolean isKilledRS(ServerName serverName) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
+<span class="sourceLineNo">193</span> public void abort(final String reason, final Throwable cause) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public Object run() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> abortRegionServer(reason, cause);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return null;<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><a name="line.202"></a>
+<span class="sourceLineNo">203</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> super.abort(reason, cause);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Alternate shutdown hook.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> private final FileSystem fs;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> super("Shutdown of " + fs);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.fs = fs;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public void run() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.fs.close();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } catch (NullPointerException npe) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.224"></a>
+<span class="sourceLineNo">225</span> } catch (IOException e) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> LOG.warn("Running hook", e);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.231"></a>
+<span class="sourceLineNo">232</span> Class<? extends HMaster> masterClass,<a name="line.232"></a>
+<span class="sourceLineNo">233</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.233"></a>
+<span class="sourceLineNo">234</span> throws IOException, InterruptedException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (masterClass == null){<a name="line.236"></a>
+<span class="sourceLineNo">237</span> masterClass = HMaster.class;<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span> if (regionserverClass == null){<a name="line.239"></a>
+<span class="sourceLineNo">240</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // start up a LocalHBaseCluster<a name="line.243"></a>
+<span class="sourceLineNo">244</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.244"></a>
+<span class="sourceLineNo">245</span> masterClass, regionserverClass);<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> // manually add the regionservers as other users<a name="line.247"></a>
+<span class="sourceLineNo">248</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (rsPorts != null) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.253"></a>
+<span class="sourceLineNo">254</span> ".hfs."+index++);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> hbaseCluster.startup();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> } catch (IOException e) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> shutdown();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throw e;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } catch (Throwable t) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> LOG.error("Error starting cluster", t);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> shutdown();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException("Shutting down", t);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> this.startRegionServer();<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> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("Killing " + server.toString());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> } else {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public boolean isKilledRS(ServerName serverName) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> //ignore timeout for now<a name="line.297"></a>
+<span class="sourceLineNo">298</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
<span class="sourceLineNo">299</span> }<a name="line.299"></a>
<span class="sourceLineNo">300</span><a name="line.300"></a>
<span class="sourceLineNo">301</span> @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> //ignore timeout for now<a name="line.303"></a>
-<span class="sourceLineNo">304</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> @Override<a name="line.307"></a>
-<span class="sourceLineNo">308</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> @Override<a name="line.322"></a>
-<span class="sourceLineNo">323</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> @Override<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> @Override<a name="line.332"></a>
-<span class="sourceLineNo">333</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> @Override<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Override<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<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> @Override<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> @Override<a name="line.357"></a>
-<span class="sourceLineNo">358</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.startMaster();<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> @Override<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> abortMaster(getMasterIndex(serverName));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> @Override<a name="line.367"></a>
-<span class="sourceLineNo">368</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> stopMaster(getMasterIndex(serverName));<a name="line.369"></a>
+<span class="sourceLineNo">302</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span> @Override<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> @Override<a name="line.336"></a>
+<span class="sourceLineNo">337</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> @Override<a name="line.341"></a>
+<span class="sourceLineNo">342</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> @Override<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> this.startMaster();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Override<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> abortMaster(getMasterIndex(serverName));<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> @Override<a name="line.361"></a>
+<span class="sourceLineNo">362</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> stopMaster(getMasterIndex(serverName));<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> @Override<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> //ignore timeout for now<a name="line.368"></a>
+<span class="sourceLineNo">369</span> waitOnMaster(getMasterIndex(serverName));<a name="line.369"></a>
<span class="sourceLineNo">370</span> }<a name="line.370"></a>
<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> @Override<a name="line.372"></a>
-<span class="sourceLineNo">373</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> //ignore timeout for now<a name="line.374"></a>
-<span class="sourceLineNo">375</span> waitOnMaster(getMasterIndex(serverName));<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">378</span> /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * Starts a region server thread running<a name="line.379"></a>
-<span class="sourceLineNo">380</span> *<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @throws IOException<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return New RegionServerThread<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throws IOException {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> User rsUser =<a name="line.387"></a>
-<span class="sourceLineNo">388</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> try {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> t = hbaseCluster.addRegionServer(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> t.start();<a name="line.393"></a>
-<span class="sourceLineNo">394</span> t.waitForServerOnline();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } catch (InterruptedException ie) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return t;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * when it can't start a region server or when the region server is not processed by master<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * within the timeout.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return New RegionServerThread<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.408"></a>
-<span class="sourceLineNo">409</span> throws IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> long start = System.currentTimeMillis();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return t;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Threads.sleep(100);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (t.getRegionServer().isOnline()) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.423"></a>
-<span class="sourceLineNo">424</span> } else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param serverNumber Used as index into a list.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public String abortRegionServer(int serverNumber) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> LOG.info("Aborting " + server.toString());<a name="line.435"></a>
-<span class="sourceLineNo">436</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return server.toString();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Shut down the specified region server cleanly<a name="line.441"></a>
-<span class="sourceLineNo">442</span> *<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * @param serverNumber Used as index into a list.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * @return the region server that was stopped<a name="line.444"></a>
-<span class="sourceLineNo">445</span> */<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> return stopRegionServer(serverNumber, true);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Shut down the specified region server cleanly<a name="line.451"></a>
-<span class="sourceLineNo">452</span> *<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * @param serverNumber Used as index into a list.<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * you are running multiple regionservers in a test and you shut down one<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * before end of the test.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @return the region server that was stopped<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.460"></a>
-<span class="sourceLineNo">461</span> final boolean shutdownFS) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> JVMClusterUtil.RegionServerThread server =<a name="line.462"></a>
-<span class="sourceLineNo">463</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> LOG.info("Stopping " + server.toString());<a name="line.464"></a>
-<span class="sourceLineNo">465</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return server;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * of running threads.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param serverNumber<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @return Name of region server that just went down.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> */<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * Starts a master thread running<a name="line.481"></a>
-<span class="sourceLineNo">482</span> *<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @return New RegionServerThread<a name="line.483"></a>
-<span class="sourceLineNo">484</span> */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> User user =<a name="line.487"></a>
-<span class="sourceLineNo">488</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> JVMClusterUtil.MasterThread t = null;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> try {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> t.start();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> } catch (InterruptedException ie) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return t;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> /**<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * Returns the current active master, if available.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @return the active HMaster, null if none is active.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> */<a name="line.503"></a>
-<span class="sourceLineNo">504</span> @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> /**<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * Returns the current active master, if available.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @return the active HMaster, null if none is active.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> */<a name="line.512"></a>
-<span class="sourceLineNo">513</span> public HMaster getMaster() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return this.hbaseCluster.getActiveMaster();<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> /**<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Returns the current active master thread, if available.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * @return the active MasterThread, null if none is active.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> */<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public MasterThread getMasterThread() {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (mt.getMaster().isActiveMaster()) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> return mt;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns the master at the specified index, if available.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * @return the active HMaster, null if none is active.<a name="line.532"></a>
-<span class="sourceLineNo">533</span> */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public HMaster getMaster(final int serverNumber) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> return this.hbaseCluster.getMaster(serverNumber);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * Cause a master to exit without shutting down entire cluster.<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param serverNumber Used as index into a list.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> */<a name="line.541"></a>
-<span class="sourceLineNo">542</span> public String abortMaster(int serverNumber) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> HMaster server = getMaster(serverNumber);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Aborting " + server.toString());<a name="line.544"></a>
-<span class="sourceLineNo">545</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.545"></a>
-<span class="sourceLineNo">546</span> return server.toString();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Shut down the specified master cleanly<a name="line.550"></a>
-<span class="sourceLineNo">551</span> *<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * @param serverNumber Used as index into a list.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * @return the region server that was stopped<a name="line.553"></a>
-<span class="sourceLineNo">554</span> */<a name="line.554"></a>
-<span class="sourceLineNo">555</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> return stopMaster(serverNumber, true);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * Shut down the specified master cleanly<a name="line.560"></a>
-<span class="sourceLineNo">561</span> *<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * @param serverNumber Used as index into a list.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * master's shutdown. Usually we do but you do not want to do this if<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * you are running multiple master in a test and you shut down one<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * before end of the test.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @return the master that was stopped<a name="line.567"></a>
-<span class="sourceLineNo">568</span> */<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber,<a name="line.569"></a>
-<span class="sourceLineNo">570</span> final boolean shutdownFS) {<a name="line.570"></a>
-<span class="sourceLineNo">571</span> JVMClusterUtil.MasterThread server =<a name="line.571"></a>
-<span class="sourceLineNo">572</span> hbaseCluster.getMasters().get(serverNumber);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> LOG.info("Stopping " + server.toString());<a name="line.573"></a>
-<span class="sourceLineNo">574</span> server.getMaster().stop("Stopping master " + serverNumber);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> return server;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * Wait for the specified master to stop. Removes this thread from list<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * of running threads.<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * @param serverNumber<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * @return Name of master that just went down.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> */<a name="line.583"></a>
-<span class="sourceLineNo">584</span> public String waitOnMaster(final int serverNumber) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return this.hbaseCluster.waitOnMaster(serverNumber);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span> /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * Blocks until there is an active master and that master has completed<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * initialization.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> *<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @return true if an active master becomes available. false if there are no<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * masters left.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @throws InterruptedException<a name="line.594"></a>
-<span class="sourceLineNo">595</span> */<a name="line.595"></a>
-<span class="sourceLineNo">596</span> @Override<a name="line.596"></a>
-<span class="sourceLineNo">597</span> public boolean waitForActiveAndReadyMaster(long timeout) throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> List<JVMClusterUtil.MasterThread> mts;<a name="line.598"></a>
-<span class="sourceLineNo">599</span> long start = System.currentTimeMillis();<a name="line.599"></a>
-<span class="sourceLineNo">600</span> while (!(mts = getMasterThreads()).isEmpty()<a name="line.600"></a>
-<span class="sourceLineNo">601</span> && (System.currentTimeMillis() - start) < timeout) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (JVMClusterUtil.MasterThread mt : mts) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (mt.getMaster().isActiveMaster() && mt.getMaster().isInitialized()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return true;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span> Threads.sleep(100);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> }<a name="line.609"></a>
-<span class="sourceLineNo">610</span> return false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * @return List of master threads.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> */<a name="line.615"></a>
-<span class="sourceLineNo">616</span> public List<JVMClusterUtil.MasterThread> getMasterThreads() {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> return this.hbaseCluster.getMasters();<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * @return List of live master threads (skips the aborted and the killed)<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> public List<JVMClusterUtil.MasterThread> getLiveMasterThreads() {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return this.hbaseCluster.getLiveMasters();<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> /**<a name="line.627"></a>
-<span class="sourceLineNo">628</span> * Wait for Mini HBase Cluster to shut down.<a name="line.628"></a>
-<span class="sourceLineNo">629</span> */<a name="line.629"></a>
-<span class="sourceLineNo">630</span> public void join() {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> this.hbaseCluster.join();<a name="line.631"></a>
-<span class="sourceLineNo">632</span> }<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span> /**<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * Shut down the mini HBase cluster<a name="line.635"></a>
-<span class="sourceLineNo">636</span> */<a name="line.636"></a>
-<span class="sourceLineNo">637</span> @Override<a name="line.637"></a>
-<span class="sourceLineNo">638</span> public void shutdown() throws IOException {<a name="line.638"></a>
-<span class="sourceLineNo">639</span> if (this.hbaseCluster != null) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span> this.hbaseCluster.shutdown();<a name="line.640"></a>
-<span class="sourceLineNo">641</span> }<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> @Override<a name="line.644"></a>
-<span class="sourceLineNo">645</span> public void close() throws IOException {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> /**<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0<a name="line.649"></a>
-<span class="sourceLineNo">650</span> * Use {@link #getClusterMetrics()} instead.<a name="line.650"></a>
-<span class="sourceLineNo">651</span> */<a name="line.651"></a>
-<span class="sourceLineNo">652</span> @Deprecated<a name="line.652"></a>
-<span class="sourceLineNo">653</span> public ClusterStatus getClusterStatus() throws IOException {<a name="line.653"></a>
+<span class="sourceLineNo">372</span> /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * Starts a region server thread running<a name="line.373"></a>
+<span class="sourceLineNo">374</span> *<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * @throws IOException<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * @return New RegionServerThread<a name="line.376"></a>
+<span class="sourceLineNo">377</span> */<a name="line.377"></a>
+<span class="sourceLineNo">378</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.378"></a>
+<span class="sourceLineNo">379</span> throws IOException {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> User rsUser =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> try {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> t = hbaseCluster.addRegionServer(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> t.start();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> t.waitForServerOnline();<a name="line.388"></a>
+<span class="sourceLineNo">389</span> } catch (InterruptedException ie) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span> return t;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.396"></a>
+<span class="sourceLineNo">397</span> * when it can't start a region server or when the region server is not processed by master<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * within the timeout.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> *<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * @return New RegionServerThread<a name="line.400"></a>
+<span class="sourceLineNo">401</span> */<a name="line.401"></a>
+<span class="sourceLineNo">402</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throws IOException {<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> long start = System.currentTimeMillis();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return t;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span> Threads.sleep(100);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (t.getRegionServer().isOnline()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @param serverNumber Used as index into a list.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public String abortRegionServer(int serverNumber) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> LOG.info("Aborting " + server.toString());<a name="line.429"></a>
+<span class="sourceLineNo">430</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return server.toString();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Shut down the specified region server cleanly<a name="line.435"></a>
+<span class="sourceLineNo">436</span> *<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * @param serverNumber Used as index into a list.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * @return the region server that was stopped<a name="line.438"></a>
+<span class="sourceLineNo">439</span> */<a name="line.439"></a>
+<span class="sourceLineNo">440</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> return stopRegionServer(serverNumber, true);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> /**<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Shut down the specified region server cleanly<a name="line.445"></a>
+<span class="sourceLineNo">446</span> *<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * @param serverNumber Used as index into a list.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * you are running multiple regionservers in a test and you shut down one<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * before end of the test.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * @return the region server that was stopped<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.454"></a>
+<span class="sourceLineNo">455</span> final boolean shutdownFS) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> JVMClusterUtil.RegionServerThread server =<a name="line.456"></a>
+<span class="sourceLineNo">457</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> LOG.info("Stopping " + server.toString());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return server;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> /**<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * of running threads.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * @param serverNumber<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * @return Name of region server that just went down.<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * Starts a master thread running<a name="line.475"></a>
+<span class="sourceLineNo">476</span> *<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @return New RegionServerThread<a name="line.477"></a>
+<span class="sourceLineNo">478</span> */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> User user =<a name="line.481"></a>
+<span class="sourceLineNo">482</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span> JVMClusterUtil.MasterThread t = null;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> try {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> t.start();<a name="line.487"></a>
+<span class="sourceLineNo">488</span> } catch (InterruptedException ie) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return t;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * Returns the current active master, if available.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * @return the active HMaster, null if none is active.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> @Override<a name="line.498"></a>
+<span class="sourceLineNo">499</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> /**<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Returns the current active master, if available.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> * @return the active HMaster, null if none is active.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> */<a name="line.506"></a>
+<span class="sourceLineNo">507</span> public HMaster getMaster() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return this.hbaseCluster.getActiveMaster();<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Returns the current active master thread, if available.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> * @return the active MasterThread, null if none is active.<a name="line.513"></a>
+<span class="sourceLineNo">514</span> */<a name="line.514"></a>
+<span class="sourceLineNo">515</span> public MasterThread getMasterThread() {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> if (mt.getMaster().isActiveMaster()) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return mt;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> return null;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * Returns the master at the specified index, if available.<a name="line.525"></a>
+<span class="sourceLineNo">526</span> * @return the active HMaster, null if none is active.<a nam
<TRUNCATED>
[13/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/allclasses-frame.html b/testdevapidocs/allclasses-frame.html
index dc266c2..92831c8 100644
--- a/testdevapidocs/allclasses-frame.html
+++ b/testdevapidocs/allclasses-frame.html
@@ -1152,6 +1152,7 @@
<li><a href="org/apache/hadoop/hbase/ipc/TestHBaseRpcControllerImpl.html" title="class in org.apache.hadoop.hbase.ipc" target="classFrame">TestHBaseRpcControllerImpl</a></li>
<li><a href="org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.html" title="class in org.apache.hadoop.hbase.security" target="classFrame">TestHBaseSaslRpcClient</a></li>
<li><a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHBaseTestingUtility</a></li>
+<li><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHBaseTestingUtilSpinup</a></li>
<li><a href="org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHColumnDescriptor</a></li>
<li><a href="org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHColumnDescriptorDefaultVersions</a></li>
<li><a href="org/apache/hadoop/hbase/TestHDFSBlocksDistribution.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHDFSBlocksDistribution</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/allclasses-noframe.html b/testdevapidocs/allclasses-noframe.html
index f301838..aabdc84 100644
--- a/testdevapidocs/allclasses-noframe.html
+++ b/testdevapidocs/allclasses-noframe.html
@@ -1152,6 +1152,7 @@
<li><a href="org/apache/hadoop/hbase/ipc/TestHBaseRpcControllerImpl.html" title="class in org.apache.hadoop.hbase.ipc">TestHBaseRpcControllerImpl</a></li>
<li><a href="org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.html" title="class in org.apache.hadoop.hbase.security">TestHBaseSaslRpcClient</a></li>
<li><a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtility</a></li>
+<li><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></li>
<li><a href="org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase">TestHColumnDescriptor</a></li>
<li><a href="org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase">TestHColumnDescriptorDefaultVersions</a></li>
<li><a href="org/apache/hadoop/hbase/TestHDFSBlocksDistribution.html" title="class in org.apache.hadoop.hbase">TestHDFSBlocksDistribution</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 6ba4eef..ec9c06a 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -1161,6 +1161,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/security/access/TestZKPermissionWatcher.html#afterClass--">afterClass()</a></span> - Static method in class org.apache.hadoop.hbase.security.access.<a href="org/apache/hadoop/hbase/security/access/TestZKPermissionWatcher.html" title="class in org.apache.hadoop.hbase.security.access">TestZKPermissionWatcher</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#afterClass--">afterClass()</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestInfoServers.html#afterClass--">afterClass()</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestInfoServers.html" title="class in org.apache.hadoop.hbase">TestInfoServers</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestMetaTableAccessor.html#afterClass--">afterClass()</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestMetaTableAccessor.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessor</a></dt>
@@ -2467,6 +2469,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/security/access/TestZKPermissionWatcher.html#beforeClass--">beforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.security.access.<a href="org/apache/hadoop/hbase/security/access/TestZKPermissionWatcher.html" title="class in org.apache.hadoop.hbase.security.access">TestZKPermissionWatcher</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#beforeClass--">beforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestInfoServers.html#beforeClass--">beforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestInfoServers.html" title="class in org.apache.hadoop.hbase">TestInfoServers</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestMetaTableAccessor.html#beforeClass--">beforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestMetaTableAccessor.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessor</a></dt>
@@ -6065,6 +6069,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtility</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHColumnDescriptor.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase">TestHColumnDescriptor</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -8062,8 +8068,6 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rest/TestTableScan.html#conf">conf</a></span> - Static variable in class org.apache.hadoop.hbase.rest.<a href="org/apache/hadoop/hbase/rest/TestTableScan.html" title="class in org.apache.hadoop.hbase.rest">TestTableScan</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#conf">conf</a></span> - Static variable in class org.apache.hadoop.hbase.rsgroup.<a href="org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html" title="class in org.apache.hadoop.hbase.rsgroup">TestEnableRSGroup</a></dt>
-<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsWithACL.html#conf">conf</a></span> - Static variable in class org.apache.hadoop.hbase.rsgroup.<a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsWithACL.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsWithACL</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/security/access/TestAccessController.BulkLoadHelper.html#conf">conf</a></span> - Variable in class org.apache.hadoop.hbase.security.access.<a href="org/apache/hadoop/hbase/security/access/TestAccessController.BulkLoadHelper.html" title="class in org.apache.hadoop.hbase.security.access">TestAccessController.BulkLoadHelper</a></dt>
@@ -23663,6 +23667,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtility</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHTableDescriptor.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHTableDescriptor.html" title="class in org.apache.hadoop.hbase">TestHTableDescriptor</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -49839,6 +49845,8 @@
<dd>
<div class="block">Test we survive a connection refused <a href="https://docs.oracle.com/javase/8/docs/api/java/net/ConnectException.html?is-external=true" title="class or interface in java.net"><code>ConnectException</code></a></div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#testGetMetaTableRows--">testGetMetaTableRows()</a></span> - Method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/metrics/impl/TestMetricRegistryImpl.html#testGetMetrics--">testGetMetrics()</a></span> - Method in class org.apache.hadoop.hbase.metrics.impl.<a href="org/apache/hadoop/hbase/metrics/impl/TestMetricRegistryImpl.html" title="class in org.apache.hadoop.hbase.metrics.impl">TestMetricRegistryImpl</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.html#testGetMisplacedRegions--">testGetMisplacedRegions()</a></span> - Method in class org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.html" title="class in org.apache.hadoop.hbase.master.balancer">TestRSGroupBasedLoadBalancer</a></dt>
@@ -50372,6 +50380,12 @@
</dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html#TestHBaseTestingUtility--">TestHBaseTestingUtility()</a></span> - Constructor for class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtility</a></dt>
<dd> </dd>
+<dt><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseTestingUtilSpinup</span></a> - Class in <a href="org/apache/hadoop/hbase/package-summary.html">org.apache.hadoop.hbase</a></dt>
+<dd>
+<div class="block">Make sure we can spin up a HBTU without a hbase-site.xml</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#TestHBaseTestingUtilSpinup--">TestHBaseTestingUtilSpinup()</a></span> - Constructor for class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><a href="org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHColumnDescriptor</span></a> - Class in <a href="org/apache/hadoop/hbase/package-summary.html">org.apache.hadoop.hbase</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
@@ -56353,7 +56367,7 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/balancer/TestRegionLocationFinder.html#testRefreshAndWait--">testRefreshAndWait()</a></span> - Method in class org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/TestRegionLocationFinder.html" title="class in org.apache.hadoop.hbase.master.balancer">TestRegionLocationFinder</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#testRefreshFileConnectionClosesConnections--">testRefreshFileConnectionClosesConnections()</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.bucket.<a href="org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">TestFileIOEngine</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#testRefreshFileConnection--">testRefreshFileConnection()</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.bucket.<a href="org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">TestFileIOEngine</a></dt>
<dd> </dd>
<dt><a href="org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.html" title="class in org.apache.hadoop.hbase.coprocessor.example"><span class="typeNameLink">TestRefreshHFilesEndpoint</span></a> - Class in <a href="org/apache/hadoop/hbase/coprocessor/example/package-summary.html">org.apache.hadoop.hbase.coprocessor.example</a></dt>
<dd> </dd>
@@ -64951,6 +64965,8 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseConfiguration.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseConfiguration.html" title="class in org.apache.hadoop.hbase">TestHBaseConfiguration</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestInfoServers.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestInfoServers.html" title="class in org.apache.hadoop.hbase">TestInfoServers</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/TestJMXConnectorServer.html#UTIL">UTIL</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestJMXConnectorServer.html" title="class in org.apache.hadoop.hbase">TestJMXConnectorServer</a></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
index e184657..0c1b3f9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
@@ -105,7 +105,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>static interface <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3623">HBaseTestingUtility.PortAllocator.AvailablePortChecker</a></pre>
+<pre>static interface <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3613">HBaseTestingUtility.PortAllocator.AvailablePortChecker</a></pre>
</li>
</ul>
</div>
@@ -149,7 +149,7 @@ var activeTableTab = "activeTableTab";
<ul class="blockListLast">
<li class="blockList">
<h4>available</h4>
-<pre>boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html#line.3624">available</a>(int port)</pre>
+<pre>boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html#line.3614">available</a>(int port)</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
index e4c6194..329c6f0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>static class <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.3562">HBaseTestingUtility.PortAllocator</a>
+<pre>static class <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.3552">HBaseTestingUtility.PortAllocator</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -250,7 +250,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>MIN_RANDOM_PORT</h4>
-<pre>private static final int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3563">MIN_RANDOM_PORT</a></pre>
+<pre>private static final int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3553">MIN_RANDOM_PORT</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.PortAllocator.MIN_RANDOM_PORT">Constant Field Values</a></dd>
@@ -263,7 +263,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>MAX_RANDOM_PORT</h4>
-<pre>private static final int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3564">MAX_RANDOM_PORT</a></pre>
+<pre>private static final int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3554">MAX_RANDOM_PORT</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.PortAllocator.MAX_RANDOM_PORT">Constant Field Values</a></dd>
@@ -276,7 +276,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>takenRandomPorts</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3567">takenRandomPorts</a></pre>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3557">takenRandomPorts</a></pre>
<div class="block">A set of ports that have been claimed using <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#randomFreePort--"><code>randomFreePort()</code></a>.</div>
</li>
</ul>
@@ -286,7 +286,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>random</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3569">random</a></pre>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3559">random</a></pre>
</li>
</ul>
<a name="portChecker">
@@ -295,7 +295,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>portChecker</h4>
-<pre>private final <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html" title="interface in org.apache.hadoop.hbase">HBaseTestingUtility.PortAllocator.AvailablePortChecker</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3570">portChecker</a></pre>
+<pre>private final <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html" title="interface in org.apache.hadoop.hbase">HBaseTestingUtility.PortAllocator.AvailablePortChecker</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3560">portChecker</a></pre>
</li>
</ul>
</li>
@@ -312,7 +312,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>PortAllocator</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3572">PortAllocator</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> random)</pre>
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3562">PortAllocator</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> random)</pre>
</li>
</ul>
<a name="PortAllocator-java.util.Random-org.apache.hadoop.hbase.HBaseTestingUtility.PortAllocator.AvailablePortChecker-">
@@ -321,7 +321,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>PortAllocator</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3588">PortAllocator</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> random,
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3578">PortAllocator</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Random.html?is-external=true" title="class or interface in java.util">Random</a> random,
<a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html" title="interface in org.apache.hadoop.hbase">HBaseTestingUtility.PortAllocator.AvailablePortChecker</a> portChecker)</pre>
</li>
</ul>
@@ -339,7 +339,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>randomFreePort</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3597">randomFreePort</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3587">randomFreePort</a>()</pre>
<div class="block">Returns a random free port and marks that port as taken. Not thread-safe. Expected to be
called from single-threaded test setup code/</div>
</li>
@@ -350,7 +350,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>randomPort</h4>
-<pre>private int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3618">randomPort</a>()</pre>
+<pre>private int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html#line.3608">randomPort</a>()</pre>
<div class="block">Returns a random port. These ports cannot be registered with IANA and are
intended for dynamic allocation (see http://bit.ly/dynports).</div>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
index 794bf9f..70ecc8d 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1983">HBaseTestingUtility.SeenRowTracker</a>
+<pre>public static class <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1973">HBaseTestingUtility.SeenRowTracker</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">A tracker for tracking and validating table rows
generated with <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#loadTable-org.apache.hadoop.hbase.client.Table-byte:A-"><code>HBaseTestingUtility.loadTable(Table, byte[])</code></a></div>
@@ -231,7 +231,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>dim</h4>
-<pre>int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1984">dim</a></pre>
+<pre>int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1974">dim</a></pre>
</li>
</ul>
<a name="seenRows">
@@ -240,7 +240,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>seenRows</h4>
-<pre>int[][][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1985">seenRows</a></pre>
+<pre>int[][][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1975">seenRows</a></pre>
</li>
</ul>
<a name="startRow">
@@ -249,7 +249,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>startRow</h4>
-<pre>byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1986">startRow</a></pre>
+<pre>byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1976">startRow</a></pre>
</li>
</ul>
<a name="stopRow">
@@ -258,7 +258,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>stopRow</h4>
-<pre>byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1987">stopRow</a></pre>
+<pre>byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1977">stopRow</a></pre>
</li>
</ul>
</li>
@@ -275,7 +275,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>SeenRowTracker</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1989">SeenRowTracker</a>(byte[] startRow,
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1979">SeenRowTracker</a>(byte[] startRow,
byte[] stopRow)</pre>
</li>
</ul>
@@ -293,7 +293,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>reset</h4>
-<pre>void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1994">reset</a>()</pre>
+<pre>void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1984">reset</a>()</pre>
</li>
</ul>
<a name="i-byte-">
@@ -302,7 +302,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>i</h4>
-<pre>int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.2000">i</a>(byte b)</pre>
+<pre>int <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1990">i</a>(byte b)</pre>
</li>
</ul>
<a name="addRow-byte:A-">
@@ -311,7 +311,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRow</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.2004">addRow</a>(byte[] row)</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.1994">addRow</a>(byte[] row)</pre>
</li>
</ul>
<a name="validate--">
@@ -320,7 +320,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>validate</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.2011">validate</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html#line.2001">validate</a>()</pre>
<div class="block">Validate that all the rows between startRow and stopRow are seen exactly once, and
all other rows none</div>
</li>
[18/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
index 41c0dae..f5ac8fc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
@@ -280,303 +280,309 @@
<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
<span class="sourceLineNo">273</span> POOL.latchCountUp();<a name="line.273"></a>
<span class="sourceLineNo">274</span> if (runCleaner()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> LOG.debug("Cleaned all WALs under {}", oldFileDir);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } else {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> LOG.warn("WALs outstanding under {}", oldFileDir);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> } finally {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> POOL.latchCountDown();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> LOG.debug("Cleaner chore disabled! Not cleaning.");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private void preRunCleaner() {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> public Boolean runCleaner() {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> preRunCleaner();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> POOL.submit(task);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return task.join();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Sort the given list in (descending) order of the space each element takes<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.307"></a>
-<span class="sourceLineNo">308</span> */<a name="line.308"></a>
-<span class="sourceLineNo">309</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (dirs == null || dirs.size() < 2) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> // no need to sort for empty or single directory<a name="line.311"></a>
-<span class="sourceLineNo">312</span> return;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> long f1ConsumedSpace = getSpace(f1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> long f2ConsumedSpace = getSpace(f2);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> private long getSpace(FileStatus f) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> Long cached = directorySpaces.get(f);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> if (cached != null) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return cached;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> long space =<a name="line.330"></a>
-<span class="sourceLineNo">331</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> directorySpaces.put(f, space);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return space;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } catch (IOException e) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return -1;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> });<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> /**<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * necessary.<a name="line.344"></a>
-<span class="sourceLineNo">345</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * @return true iff successfully deleted all files<a name="line.346"></a>
-<span class="sourceLineNo">347</span> */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (files == null) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return true;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // first check to see if the path is valid<a name="line.353"></a>
-<span class="sourceLineNo">354</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.354"></a>
-<span class="sourceLineNo">355</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> for (FileStatus file : files) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (validate(file.getPath())) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> validFiles.add(file);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> invalidFiles.add(file);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // check each of the cleaners for the valid files<a name="line.366"></a>
-<span class="sourceLineNo">367</span> for (T cleaner : cleanersChain) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.369"></a>
-<span class="sourceLineNo">370</span> + this.oldFileDir);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return false;<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> // trace which cleaner is holding on to each file<a name="line.376"></a>
-<span class="sourceLineNo">377</span> if (LOG.isTraceEnabled()) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> for (FileStatus file : deletableValidFiles) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (!filteredFileSet.contains(file)) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> deletableValidFiles = filteredFiles;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return deleteFiles(filesToDelete) == files.size();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * Delete the given files<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param filesToDelete files to delete<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * @return number of deleted files<a name="line.396"></a>
-<span class="sourceLineNo">397</span> */<a name="line.397"></a>
-<span class="sourceLineNo">398</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int deletedFileCount = 0;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> for (FileStatus file : filesToDelete) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> Path filePath = file.getPath();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> LOG.trace("Removing {} from archive", filePath);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> try {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> boolean success = this.fs.delete(filePath, false);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> if (success) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> deletedFileCount++;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> LOG.warn("Attempted to delete:" + filePath<a name="line.408"></a>
-<span class="sourceLineNo">409</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (IOException e) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> e = e instanceof RemoteException ?<a name="line.412"></a>
-<span class="sourceLineNo">413</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return deletedFileCount;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> @Override<a name="line.420"></a>
-<span class="sourceLineNo">421</span> public synchronized void cleanup() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> for (T lc : this.cleanersChain) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> try {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> lc.stop("Exiting");<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } catch (Throwable t) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> LOG.warn("Stopping", t);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> @VisibleForTesting<a name="line.431"></a>
-<span class="sourceLineNo">432</span> int getChorePoolSize() {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return POOL.size;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * @param enabled<a name="line.437"></a>
-<span class="sourceLineNo">438</span> */<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public boolean setEnabled(final boolean enabled) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return this.enabled.getAndSet(enabled);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> public boolean getEnabled() { return this.enabled.get();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> private interface Action<T> {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> T act() throws IOException;<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> */<a name="line.453"></a>
-<span class="sourceLineNo">454</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> private final Path dir;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> private final boolean root;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> this(dir.getPath(), root);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> CleanerTask(final Path dir, final boolean root) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> this.dir = dir;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> this.root = root;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> @Override<a name="line.467"></a>
-<span class="sourceLineNo">468</span> protected Boolean compute() {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> LOG.debug("Cleaning under {}", dir);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> List<FileStatus> subDirs;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> List<FileStatus> files;<a name="line.471"></a>
-<span class="sourceLineNo">472</span> try {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // which will fall through to succeeding.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.475"></a>
-<span class="sourceLineNo">476</span> files = getFilteredStatus(status -> status.isFile());<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } catch (IOException ioe) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> return false;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> boolean nullSubDirs = subDirs == null;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (nullSubDirs) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> LOG.trace("There is no subdir under {}", dir);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> if (files == null) {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> LOG.trace("There is no file under {}", dir);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.490"></a>
-<span class="sourceLineNo">491</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if (!nullSubDirs) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> sortByConsumedSpace(subDirs);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (FileStatus subdir : subDirs) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> tasks.add(task);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> task.fork();<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> boolean result = true;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.502"></a>
-<span class="sourceLineNo">503</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.504"></a>
-<span class="sourceLineNo">505</span> // it is not the root dir, then task will try to delete it.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> if (result && !root) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> return result;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> /**<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * Get FileStatus with filter.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * even though status is empty but not null.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * @param function a filter function<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @throws IOException if there's an error other than dir not existing<a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Perform a delete on a specified type.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * @param deletion a delete<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * @return true if it deleted successfully, false otherwise<a name="line.528"></a>
-<span class="sourceLineNo">529</span> */<a name="line.529"></a>
-<span class="sourceLineNo">530</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span> boolean deleted;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> try {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> deleted = deletion.act();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.536"></a>
-<span class="sourceLineNo">537</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.537"></a>
-<span class="sourceLineNo">538</span> // message below.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.539"></a>
-<span class="sourceLineNo">540</span> "exception details at TRACE.", dir);<a name="line.540"></a>
-<span class="sourceLineNo">541</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> deleted = false;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> } catch (IOException ioe) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.544"></a>
-<span class="sourceLineNo">545</span> "happening, use following exception when asking on mailing list.",<a name="line.545"></a>
-<span class="sourceLineNo">546</span> type, dir, ioe);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> deleted = false;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> return deleted;<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> /**<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * Get cleaner results of subdirs.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * @param tasks subdirs cleaner tasks<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.556"></a>
-<span class="sourceLineNo">557</span> * @throws IOException something happen during computation<a name="line.557"></a>
-<span class="sourceLineNo">558</span> */<a name="line.558"></a>
-<span class="sourceLineNo">559</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> boolean cleaned = true;<a name="line.560"></a>
-<span class="sourceLineNo">561</span> try {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> for (CleanerTask task : tasks) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> cleaned &= task.get();<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> } catch (InterruptedException | ExecutionException e) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> throw new IOException(e);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span> return cleaned;<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>}<a name="line.571"></a>
+<span class="sourceLineNo">275</span> if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> LOG.trace("Cleaned all WALs under {}", oldFileDir);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> } else {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (LOG.isTraceEnabled()) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> LOG.trace("WALs outstanding under {}", oldFileDir);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> } finally {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> POOL.latchCountDown();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> } else {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (LOG.isTraceEnabled()) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> LOG.trace("Cleaner chore disabled! Not cleaning.");<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> private void preRunCleaner() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> public Boolean runCleaner() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> preRunCleaner();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> POOL.submit(task);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return task.join();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * Sort the given list in (descending) order of the space each element takes<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (dirs == null || dirs.size() < 2) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // no need to sort for empty or single directory<a name="line.317"></a>
+<span class="sourceLineNo">318</span> return;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> @Override<a name="line.323"></a>
+<span class="sourceLineNo">324</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> long f1ConsumedSpace = getSpace(f1);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long f2ConsumedSpace = getSpace(f2);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<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> private long getSpace(FileStatus f) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Long cached = directorySpaces.get(f);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (cached != null) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return cached;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> long space =<a name="line.336"></a>
+<span class="sourceLineNo">337</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> directorySpaces.put(f, space);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return space;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } catch (IOException e) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> return -1;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span> });<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * necessary.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * @return true iff successfully deleted all files<a name="line.352"></a>
+<span class="sourceLineNo">353</span> */<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> if (files == null) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return true;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> // first check to see if the path is valid<a name="line.359"></a>
+<span class="sourceLineNo">360</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.360"></a>
+<span class="sourceLineNo">361</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (FileStatus file : files) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (validate(file.getPath())) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> validFiles.add(file);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.366"></a>
+<span class="sourceLineNo">367</span> invalidFiles.add(file);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> // check each of the cleaners for the valid files<a name="line.372"></a>
+<span class="sourceLineNo">373</span> for (T cleaner : cleanersChain) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.375"></a>
+<span class="sourceLineNo">376</span> + this.oldFileDir);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return false;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> // trace which cleaner is holding on to each file<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (LOG.isTraceEnabled()) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (FileStatus file : deletableValidFiles) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (!filteredFileSet.contains(file)) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> deletableValidFiles = filteredFiles;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> return deleteFiles(filesToDelete) == files.size();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * Delete the given files<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * @param filesToDelete files to delete<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * @return number of deleted files<a name="line.402"></a>
+<span class="sourceLineNo">403</span> */<a name="line.403"></a>
+<span class="sourceLineNo">404</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> int deletedFileCount = 0;<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for (FileStatus file : filesToDelete) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> Path filePath = file.getPath();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> LOG.trace("Removing {} from archive", filePath);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> try {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> boolean success = this.fs.delete(filePath, false);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (success) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> deletedFileCount++;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> } else {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> LOG.warn("Attempted to delete:" + filePath<a name="line.414"></a>
+<span class="sourceLineNo">415</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> } catch (IOException e) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> e = e instanceof RemoteException ?<a name="line.418"></a>
+<span class="sourceLineNo">419</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return deletedFileCount;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public synchronized void cleanup() {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> for (T lc : this.cleanersChain) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> try {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> lc.stop("Exiting");<a name="line.430"></a>
+<span class="sourceLineNo">431</span> } catch (Throwable t) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> LOG.warn("Stopping", t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @VisibleForTesting<a name="line.437"></a>
+<span class="sourceLineNo">438</span> int getChorePoolSize() {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return POOL.size;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * @param enabled<a name="line.443"></a>
+<span class="sourceLineNo">444</span> */<a name="line.444"></a>
+<span class="sourceLineNo">445</span> public boolean setEnabled(final boolean enabled) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> return this.enabled.getAndSet(enabled);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> public boolean getEnabled() { return this.enabled.get();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> private interface Action<T> {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> T act() throws IOException;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> /**<a name="line.456"></a>
+<span class="sourceLineNo">457</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> */<a name="line.459"></a>
+<span class="sourceLineNo">460</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> private final Path dir;<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private final boolean root;<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this(dir.getPath(), root);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> CleanerTask(final Path dir, final boolean root) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> this.dir = dir;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> this.root = root;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> @Override<a name="line.473"></a>
+<span class="sourceLineNo">474</span> protected Boolean compute() {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> LOG.debug("Cleaning under {}", dir);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> List<FileStatus> subDirs;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> List<FileStatus> files;<a name="line.477"></a>
+<span class="sourceLineNo">478</span> try {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // which will fall through to succeeding.<a name="line.480"></a>
+<span class="sourceLineNo">481</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> files = getFilteredStatus(status -> status.isFile());<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } catch (IOException ioe) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> return false;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> boolean nullSubDirs = subDirs == null;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (nullSubDirs) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> LOG.trace("There is no subdir under {}", dir);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span> if (files == null) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> LOG.trace("There is no file under {}", dir);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.496"></a>
+<span class="sourceLineNo">497</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (!nullSubDirs) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> sortByConsumedSpace(subDirs);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> for (FileStatus subdir : subDirs) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> tasks.add(task);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> task.fork();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> boolean result = true;<a name="line.507"></a>
+<span class="sourceLineNo">508</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.508"></a>
+<span class="sourceLineNo">509</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.509"></a>
+<span class="sourceLineNo">510</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // it is not the root dir, then task will try to delete it.<a name="line.511"></a>
+<span class="sourceLineNo">512</span> if (result && !root) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span> return result;<a name="line.515"></a>
+<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span> /**<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * Get FileStatus with filter.<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * even though status is empty but not null.<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * @param function a filter function<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @throws IOException if there's an error other than dir not existing<a name="line.524"></a>
+<span class="sourceLineNo">525</span> */<a name="line.525"></a>
+<span class="sourceLineNo">526</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Perform a delete on a specified type.<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * @param deletion a delete<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * @return true if it deleted successfully, false otherwise<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> boolean deleted;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> try {<a name="line.538"></a>
+<span class="sourceLineNo">539</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> deleted = deletion.act();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.542"></a>
+<span class="sourceLineNo">543</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.543"></a>
+<span class="sourceLineNo">544</span> // message below.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.545"></a>
+<span class="sourceLineNo">546</span> "exception details at TRACE.", dir);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> deleted = false;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> } catch (IOException ioe) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.550"></a>
+<span class="sourceLineNo">551</span> "happening, use following exception when asking on mailing list.",<a name="line.551"></a>
+<span class="sourceLineNo">552</span> type, dir, ioe);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> deleted = false;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> }<a name="line.554"></a>
+<span class="sourceLineNo">555</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return deleted;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
+<span class="sourceLineNo">560</span> * Get cleaner results of subdirs.<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * @param tasks subdirs cleaner tasks<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * @throws IOException something happen during computation<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.565"></a>
+<span class="sourceLineNo">566</span> boolean cleaned = true;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> try {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> for (CleanerTask task : tasks) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> cleaned &= task.get();<a name="line.569"></a>
+<span class="sourceLineNo">570</span> }<a name="line.570"></a>
+<span class="sourceLineNo">571</span> } catch (InterruptedException | ExecutionException e) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new IOException(e);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return cleaned;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>}<a name="line.577"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index 74e56fe..722e8e0 100644
--- a/downloads.html
+++ b/downloads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase Downloads</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -366,7 +366,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 5fa9e7f..fd74cce 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Export Control
@@ -331,7 +331,7 @@ for more details.</p>
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 121f6ef..5ee7ed8 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBaseâ„¢ Home</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -409,7 +409,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index e555383..290db29 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – CI Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -291,7 +291,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 6d39cda..7f301cd 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Issue Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -288,7 +288,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index ba72019..fe6495c 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Licenses</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -491,7 +491,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/mail-lists.html
----------------------------------------------------------------------
diff --git a/mail-lists.html b/mail-lists.html
index 7c4639f..dafaac4 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Mailing Lists</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -341,7 +341,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/metrics.html
----------------------------------------------------------------------
diff --git a/metrics.html b/metrics.html
index 56f4ac9..1e6bda4 100644
--- a/metrics.html
+++ b/metrics.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Metrics
@@ -459,7 +459,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/old_news.html
----------------------------------------------------------------------
diff --git a/old_news.html b/old_news.html
index 8c67baf..dea9f69 100644
--- a/old_news.html
+++ b/old_news.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Old Apache HBase (TM) News
@@ -440,7 +440,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/plugin-management.html
----------------------------------------------------------------------
diff --git a/plugin-management.html b/plugin-management.html
index c8192f4..e5d3269 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugin Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/plugins.html
----------------------------------------------------------------------
diff --git a/plugins.html b/plugins.html
index 6244afa..686c1fa 100644
--- a/plugins.html
+++ b/plugins.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Plugins</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -375,7 +375,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/poweredbyhbase.html
----------------------------------------------------------------------
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 4cb36cc..571dbbd 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Powered By Apache HBase™</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -769,7 +769,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/project-info.html
----------------------------------------------------------------------
diff --git a/project-info.html b/project-info.html
index 3b6fab7..bbac2e8 100644
--- a/project-info.html
+++ b/project-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -335,7 +335,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/project-reports.html
----------------------------------------------------------------------
diff --git a/project-reports.html b/project-reports.html
index 6109e64..6281bd2 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Generated Reports</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -305,7 +305,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/project-summary.html
----------------------------------------------------------------------
diff --git a/project-summary.html b/project-summary.html
index 62028d4..cf2d8a6 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Summary</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/pseudo-distributed.html
----------------------------------------------------------------------
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index 8648ff5..fa3afca 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Running Apache HBase (TM) in pseudo-distributed mode
@@ -308,7 +308,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/replication.html
----------------------------------------------------------------------
diff --git a/replication.html b/replication.html
index d027e61..8242ab7 100644
--- a/replication.html
+++ b/replication.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Apache HBase (TM) Replication
@@ -303,7 +303,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/resources.html
----------------------------------------------------------------------
diff --git a/resources.html b/resources.html
index 360aef0..a4bcbfa 100644
--- a/resources.html
+++ b/resources.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Other Apache HBase (TM) Resources</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -331,7 +331,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/source-repository.html
----------------------------------------------------------------------
diff --git a/source-repository.html b/source-repository.html
index 39d7098..b94ccc1 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Source Code Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -299,7 +299,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/sponsors.html
----------------------------------------------------------------------
diff --git a/sponsors.html b/sponsors.html
index 2d1dba0..c8bb2c2 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase™ Sponsors</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -333,7 +333,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index 2aabd52..d097c45 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Supporting Projects</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -520,7 +520,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index b270e0e..ef237f1 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Team</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -730,7 +730,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
[20/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
index 41c0dae..f5ac8fc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
@@ -280,303 +280,309 @@
<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
<span class="sourceLineNo">273</span> POOL.latchCountUp();<a name="line.273"></a>
<span class="sourceLineNo">274</span> if (runCleaner()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> LOG.debug("Cleaned all WALs under {}", oldFileDir);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } else {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> LOG.warn("WALs outstanding under {}", oldFileDir);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> } finally {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> POOL.latchCountDown();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> LOG.debug("Cleaner chore disabled! Not cleaning.");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private void preRunCleaner() {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> public Boolean runCleaner() {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> preRunCleaner();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> POOL.submit(task);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return task.join();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Sort the given list in (descending) order of the space each element takes<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.307"></a>
-<span class="sourceLineNo">308</span> */<a name="line.308"></a>
-<span class="sourceLineNo">309</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (dirs == null || dirs.size() < 2) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> // no need to sort for empty or single directory<a name="line.311"></a>
-<span class="sourceLineNo">312</span> return;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> long f1ConsumedSpace = getSpace(f1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> long f2ConsumedSpace = getSpace(f2);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> private long getSpace(FileStatus f) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> Long cached = directorySpaces.get(f);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> if (cached != null) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return cached;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> long space =<a name="line.330"></a>
-<span class="sourceLineNo">331</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> directorySpaces.put(f, space);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return space;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } catch (IOException e) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return -1;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> });<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> /**<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * necessary.<a name="line.344"></a>
-<span class="sourceLineNo">345</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * @return true iff successfully deleted all files<a name="line.346"></a>
-<span class="sourceLineNo">347</span> */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (files == null) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return true;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // first check to see if the path is valid<a name="line.353"></a>
-<span class="sourceLineNo">354</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.354"></a>
-<span class="sourceLineNo">355</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> for (FileStatus file : files) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (validate(file.getPath())) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> validFiles.add(file);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> invalidFiles.add(file);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // check each of the cleaners for the valid files<a name="line.366"></a>
-<span class="sourceLineNo">367</span> for (T cleaner : cleanersChain) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.369"></a>
-<span class="sourceLineNo">370</span> + this.oldFileDir);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return false;<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> // trace which cleaner is holding on to each file<a name="line.376"></a>
-<span class="sourceLineNo">377</span> if (LOG.isTraceEnabled()) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> for (FileStatus file : deletableValidFiles) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (!filteredFileSet.contains(file)) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> deletableValidFiles = filteredFiles;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return deleteFiles(filesToDelete) == files.size();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * Delete the given files<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param filesToDelete files to delete<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * @return number of deleted files<a name="line.396"></a>
-<span class="sourceLineNo">397</span> */<a name="line.397"></a>
-<span class="sourceLineNo">398</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int deletedFileCount = 0;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> for (FileStatus file : filesToDelete) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> Path filePath = file.getPath();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> LOG.trace("Removing {} from archive", filePath);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> try {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> boolean success = this.fs.delete(filePath, false);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> if (success) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> deletedFileCount++;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> LOG.warn("Attempted to delete:" + filePath<a name="line.408"></a>
-<span class="sourceLineNo">409</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (IOException e) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> e = e instanceof RemoteException ?<a name="line.412"></a>
-<span class="sourceLineNo">413</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return deletedFileCount;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> @Override<a name="line.420"></a>
-<span class="sourceLineNo">421</span> public synchronized void cleanup() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> for (T lc : this.cleanersChain) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> try {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> lc.stop("Exiting");<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } catch (Throwable t) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> LOG.warn("Stopping", t);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> @VisibleForTesting<a name="line.431"></a>
-<span class="sourceLineNo">432</span> int getChorePoolSize() {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return POOL.size;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * @param enabled<a name="line.437"></a>
-<span class="sourceLineNo">438</span> */<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public boolean setEnabled(final boolean enabled) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return this.enabled.getAndSet(enabled);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> public boolean getEnabled() { return this.enabled.get();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> private interface Action<T> {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> T act() throws IOException;<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> */<a name="line.453"></a>
-<span class="sourceLineNo">454</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> private final Path dir;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> private final boolean root;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> this(dir.getPath(), root);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> CleanerTask(final Path dir, final boolean root) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> this.dir = dir;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> this.root = root;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> @Override<a name="line.467"></a>
-<span class="sourceLineNo">468</span> protected Boolean compute() {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> LOG.debug("Cleaning under {}", dir);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> List<FileStatus> subDirs;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> List<FileStatus> files;<a name="line.471"></a>
-<span class="sourceLineNo">472</span> try {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // which will fall through to succeeding.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.475"></a>
-<span class="sourceLineNo">476</span> files = getFilteredStatus(status -> status.isFile());<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } catch (IOException ioe) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> return false;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> boolean nullSubDirs = subDirs == null;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (nullSubDirs) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> LOG.trace("There is no subdir under {}", dir);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> if (files == null) {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> LOG.trace("There is no file under {}", dir);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.490"></a>
-<span class="sourceLineNo">491</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if (!nullSubDirs) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> sortByConsumedSpace(subDirs);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (FileStatus subdir : subDirs) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> tasks.add(task);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> task.fork();<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> boolean result = true;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.502"></a>
-<span class="sourceLineNo">503</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.504"></a>
-<span class="sourceLineNo">505</span> // it is not the root dir, then task will try to delete it.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> if (result && !root) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> return result;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> /**<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * Get FileStatus with filter.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * even though status is empty but not null.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * @param function a filter function<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @throws IOException if there's an error other than dir not existing<a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Perform a delete on a specified type.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * @param deletion a delete<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * @return true if it deleted successfully, false otherwise<a name="line.528"></a>
-<span class="sourceLineNo">529</span> */<a name="line.529"></a>
-<span class="sourceLineNo">530</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span> boolean deleted;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> try {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> deleted = deletion.act();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.536"></a>
-<span class="sourceLineNo">537</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.537"></a>
-<span class="sourceLineNo">538</span> // message below.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.539"></a>
-<span class="sourceLineNo">540</span> "exception details at TRACE.", dir);<a name="line.540"></a>
-<span class="sourceLineNo">541</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> deleted = false;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> } catch (IOException ioe) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.544"></a>
-<span class="sourceLineNo">545</span> "happening, use following exception when asking on mailing list.",<a name="line.545"></a>
-<span class="sourceLineNo">546</span> type, dir, ioe);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> deleted = false;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> return deleted;<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> /**<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * Get cleaner results of subdirs.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * @param tasks subdirs cleaner tasks<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.556"></a>
-<span class="sourceLineNo">557</span> * @throws IOException something happen during computation<a name="line.557"></a>
-<span class="sourceLineNo">558</span> */<a name="line.558"></a>
-<span class="sourceLineNo">559</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> boolean cleaned = true;<a name="line.560"></a>
-<span class="sourceLineNo">561</span> try {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> for (CleanerTask task : tasks) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> cleaned &= task.get();<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> } catch (InterruptedException | ExecutionException e) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> throw new IOException(e);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span> return cleaned;<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>}<a name="line.571"></a>
+<span class="sourceLineNo">275</span> if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> LOG.trace("Cleaned all WALs under {}", oldFileDir);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> } else {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (LOG.isTraceEnabled()) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> LOG.trace("WALs outstanding under {}", oldFileDir);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> } finally {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> POOL.latchCountDown();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> } else {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (LOG.isTraceEnabled()) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> LOG.trace("Cleaner chore disabled! Not cleaning.");<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> private void preRunCleaner() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> public Boolean runCleaner() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> preRunCleaner();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> POOL.submit(task);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return task.join();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * Sort the given list in (descending) order of the space each element takes<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (dirs == null || dirs.size() < 2) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // no need to sort for empty or single directory<a name="line.317"></a>
+<span class="sourceLineNo">318</span> return;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> @Override<a name="line.323"></a>
+<span class="sourceLineNo">324</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> long f1ConsumedSpace = getSpace(f1);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long f2ConsumedSpace = getSpace(f2);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<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> private long getSpace(FileStatus f) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Long cached = directorySpaces.get(f);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (cached != null) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return cached;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> long space =<a name="line.336"></a>
+<span class="sourceLineNo">337</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> directorySpaces.put(f, space);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return space;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } catch (IOException e) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> return -1;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span> });<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * necessary.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * @return true iff successfully deleted all files<a name="line.352"></a>
+<span class="sourceLineNo">353</span> */<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> if (files == null) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return true;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> // first check to see if the path is valid<a name="line.359"></a>
+<span class="sourceLineNo">360</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.360"></a>
+<span class="sourceLineNo">361</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (FileStatus file : files) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (validate(file.getPath())) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> validFiles.add(file);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.366"></a>
+<span class="sourceLineNo">367</span> invalidFiles.add(file);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> // check each of the cleaners for the valid files<a name="line.372"></a>
+<span class="sourceLineNo">373</span> for (T cleaner : cleanersChain) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.375"></a>
+<span class="sourceLineNo">376</span> + this.oldFileDir);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return false;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> // trace which cleaner is holding on to each file<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (LOG.isTraceEnabled()) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (FileStatus file : deletableValidFiles) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (!filteredFileSet.contains(file)) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> deletableValidFiles = filteredFiles;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> return deleteFiles(filesToDelete) == files.size();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * Delete the given files<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * @param filesToDelete files to delete<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * @return number of deleted files<a name="line.402"></a>
+<span class="sourceLineNo">403</span> */<a name="line.403"></a>
+<span class="sourceLineNo">404</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> int deletedFileCount = 0;<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for (FileStatus file : filesToDelete) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> Path filePath = file.getPath();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> LOG.trace("Removing {} from archive", filePath);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> try {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> boolean success = this.fs.delete(filePath, false);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (success) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> deletedFileCount++;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> } else {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> LOG.warn("Attempted to delete:" + filePath<a name="line.414"></a>
+<span class="sourceLineNo">415</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> } catch (IOException e) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> e = e instanceof RemoteException ?<a name="line.418"></a>
+<span class="sourceLineNo">419</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return deletedFileCount;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public synchronized void cleanup() {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> for (T lc : this.cleanersChain) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> try {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> lc.stop("Exiting");<a name="line.430"></a>
+<span class="sourceLineNo">431</span> } catch (Throwable t) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> LOG.warn("Stopping", t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @VisibleForTesting<a name="line.437"></a>
+<span class="sourceLineNo">438</span> int getChorePoolSize() {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return POOL.size;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * @param enabled<a name="line.443"></a>
+<span class="sourceLineNo">444</span> */<a name="line.444"></a>
+<span class="sourceLineNo">445</span> public boolean setEnabled(final boolean enabled) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> return this.enabled.getAndSet(enabled);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> public boolean getEnabled() { return this.enabled.get();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> private interface Action<T> {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> T act() throws IOException;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> /**<a name="line.456"></a>
+<span class="sourceLineNo">457</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> */<a name="line.459"></a>
+<span class="sourceLineNo">460</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> private final Path dir;<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private final boolean root;<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this(dir.getPath(), root);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> CleanerTask(final Path dir, final boolean root) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> this.dir = dir;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> this.root = root;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> @Override<a name="line.473"></a>
+<span class="sourceLineNo">474</span> protected Boolean compute() {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> LOG.debug("Cleaning under {}", dir);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> List<FileStatus> subDirs;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> List<FileStatus> files;<a name="line.477"></a>
+<span class="sourceLineNo">478</span> try {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // which will fall through to succeeding.<a name="line.480"></a>
+<span class="sourceLineNo">481</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> files = getFilteredStatus(status -> status.isFile());<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } catch (IOException ioe) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> return false;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> boolean nullSubDirs = subDirs == null;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (nullSubDirs) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> LOG.trace("There is no subdir under {}", dir);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span> if (files == null) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> LOG.trace("There is no file under {}", dir);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.496"></a>
+<span class="sourceLineNo">497</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (!nullSubDirs) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> sortByConsumedSpace(subDirs);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> for (FileStatus subdir : subDirs) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> tasks.add(task);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> task.fork();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> boolean result = true;<a name="line.507"></a>
+<span class="sourceLineNo">508</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.508"></a>
+<span class="sourceLineNo">509</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.509"></a>
+<span class="sourceLineNo">510</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // it is not the root dir, then task will try to delete it.<a name="line.511"></a>
+<span class="sourceLineNo">512</span> if (result && !root) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span> return result;<a name="line.515"></a>
+<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span> /**<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * Get FileStatus with filter.<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * even though status is empty but not null.<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * @param function a filter function<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @throws IOException if there's an error other than dir not existing<a name="line.524"></a>
+<span class="sourceLineNo">525</span> */<a name="line.525"></a>
+<span class="sourceLineNo">526</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Perform a delete on a specified type.<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * @param deletion a delete<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * @return true if it deleted successfully, false otherwise<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> boolean deleted;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> try {<a name="line.538"></a>
+<span class="sourceLineNo">539</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> deleted = deletion.act();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.542"></a>
+<span class="sourceLineNo">543</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.543"></a>
+<span class="sourceLineNo">544</span> // message below.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.545"></a>
+<span class="sourceLineNo">546</span> "exception details at TRACE.", dir);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> deleted = false;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> } catch (IOException ioe) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.550"></a>
+<span class="sourceLineNo">551</span> "happening, use following exception when asking on mailing list.",<a name="line.551"></a>
+<span class="sourceLineNo">552</span> type, dir, ioe);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> deleted = false;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> }<a name="line.554"></a>
+<span class="sourceLineNo">555</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return deleted;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
+<span class="sourceLineNo">560</span> * Get cleaner results of subdirs.<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * @param tasks subdirs cleaner tasks<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * @throws IOException something happen during computation<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.565"></a>
+<span class="sourceLineNo">566</span> boolean cleaned = true;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> try {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> for (CleanerTask task : tasks) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> cleaned &= task.get();<a name="line.569"></a>
+<span class="sourceLineNo">570</span> }<a name="line.570"></a>
+<span class="sourceLineNo">571</span> } catch (InterruptedException | ExecutionException e) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new IOException(e);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return cleaned;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>}<a name="line.577"></a>
[26/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
index 3647d12..25faf76 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
@@ -34,292 +34,308 @@
<span class="sourceLineNo">026</span>import java.nio.channels.ClosedChannelException;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import java.nio.channels.FileChannel;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import java.util.Arrays;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.util.StringUtils;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * IO engine that stores data to a file on the local file system.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@InterfaceAudience.Private<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public class FileIOEngine implements IOEngine {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public static final String FILE_DELIMITER = ",";<a name="line.48"></a>
-<span class="sourceLineNo">049</span> private final String[] filePaths;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private final FileChannel[] fileChannels;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> private final RandomAccessFile[] rafs;<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private final long sizePerFile;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final long capacity;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.59"></a>
-<span class="sourceLineNo">060</span> throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> this.sizePerFile = capacity / filePaths.length;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> this.filePaths = filePaths;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (!maintainPersistence) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> for (String filePath : filePaths) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> File file = new File(filePath);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> if (file.exists()) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (LOG.isDebugEnabled()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> file.delete();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> // If deletion fails still we can manage with the writes<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> String filePath = filePaths[i];<a name="line.79"></a>
-<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.81"></a>
-<span class="sourceLineNo">082</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (totalSpace < sizePerFile) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // The next setting length will throw exception,logging this message<a name="line.84"></a>
-<span class="sourceLineNo">085</span> // is just used for the detail reason of exception，<a name="line.85"></a>
-<span class="sourceLineNo">086</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.86"></a>
-<span class="sourceLineNo">087</span> + " total space under " + filePath + ", not enough for requested "<a name="line.87"></a>
-<span class="sourceLineNo">088</span> + StringUtils.byteDesc(sizePerFile);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> LOG.warn(msg);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> rafs[i].setLength(sizePerFile);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> fileChannels[i] = rafs[i].getChannel();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.93"></a>
-<span class="sourceLineNo">094</span> + ", on the path:" + filePath);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> } catch (IOException fex) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> shutdown();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> throw fex;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public String toString() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.105"></a>
-<span class="sourceLineNo">106</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * File IO engine is always able to support persistent storage for the cache<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @return true<a name="line.111"></a>
-<span class="sourceLineNo">112</span> */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public boolean isPersistent() {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Transfers data from file to the given byte buffer<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param offset The offset in the file where the first byte to be read<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param length The length of buffer that should be allocated for reading<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * from the file channel<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @return number of bytes read<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @throws IOException<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (length != 0) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // the results are not corrupted before consuming them.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (dstBuffer.limit() != length) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.138"></a>
-<span class="sourceLineNo">139</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<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> @VisibleForTesting<a name="line.145"></a>
-<span class="sourceLineNo">146</span> void closeFileChannels() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> for (FileChannel fileChannel: fileChannels) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> fileChannel.close();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } catch (IOException e) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.warn("Failed to close FileChannel", e);<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> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * Transfers data from the given byte buffer to file<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * @param offset The offset in the file where the first byte to be written<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @throws IOException<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (!srcBuffer.hasRemaining()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> accessFile(writeAccessor, srcBuffer, offset);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Sync the data to file after writing<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @throws IOException<a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public void sync() throws IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (fileChannels[i] != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> fileChannels[i].force(true);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> } catch (IOException ie) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> throw ie;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Close the file<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void shutdown() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (fileChannels[i] != null) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> fileChannels[i].close();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (rafs[i] != null) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rafs[i].close();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } catch (IOException ex) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> assert srcBuffer.hasArray();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.211"></a>
-<span class="sourceLineNo">212</span> srcBuffer.remaining()), offset);<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">215</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.215"></a>
-<span class="sourceLineNo">216</span> long globalOffset) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> int startFileNum = getFileNum(globalOffset);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> int remainingAccessDataLen = buffer.remaining();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> int accessFileNum = startFileNum;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> int bufLimit = buffer.limit();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> while (true) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.224"></a>
-<span class="sourceLineNo">225</span> int accessLen = 0;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (endFileNum > accessFileNum) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // short the limit;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.228"></a>
-<span class="sourceLineNo">229</span> + sizePerFile - accessOffset));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span> try {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (ClosedByInterruptException e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> throw e;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> } catch (ClosedChannelException e) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file. ", e);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> refreshFileConnection(accessFileNum);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> continue;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // recover the limit<a name="line.240"></a>
-<span class="sourceLineNo">241</span> buffer.limit(bufLimit);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (accessLen < remainingAccessDataLen) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> remainingAccessDataLen -= accessLen;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> accessFileNum++;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> accessOffset = 0;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> break;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (accessFileNum >= fileChannels.length) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.250"></a>
-<span class="sourceLineNo">251</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.251"></a>
-<span class="sourceLineNo">252</span> + globalOffset);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Get the absolute offset in given file with the relative global offset.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * @param fileNum<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * @param globalOffset<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @return the absolute offset<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return globalOffset - fileNum * sizePerFile;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> private int getFileNum(long offset) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (offset < 0) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> int fileNum = (int) (offset / sizePerFile);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (fileNum >= fileChannels.length) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new RuntimeException("Not expected offset " + offset<a name="line.273"></a>
-<span class="sourceLineNo">274</span> + " where capacity=" + capacity);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> return fileNum;<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @VisibleForTesting<a name="line.279"></a>
-<span class="sourceLineNo">280</span> FileChannel[] getFileChannels() {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return fileChannels;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> @VisibleForTesting<a name="line.284"></a>
-<span class="sourceLineNo">285</span> void refreshFileConnection(int accessFileNum) throws IOException {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (fileChannel != null) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> fileChannel.close();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private static interface FileAccessor {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.295"></a>
-<span class="sourceLineNo">296</span> throws IOException;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> private static class FileReadAccessor implements FileAccessor {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.301"></a>
-<span class="sourceLineNo">302</span> long accessOffset) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
-<span class="sourceLineNo">309</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> long accessOffset) throws IOException {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> return fileChannel.write(byteBuffer, accessOffset);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">029</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.util.StringUtils;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * IO engine that stores data to a file on the local file system.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public class FileIOEngine implements IOEngine {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public static final String FILE_DELIMITER = ",";<a name="line.49"></a>
+<span class="sourceLineNo">050</span> private final String[] filePaths;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private final FileChannel[] fileChannels;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private final RandomAccessFile[] rafs;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final ReentrantLock[] channelLocks;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private final long sizePerFile;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private final long capacity;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> throws IOException {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.sizePerFile = capacity / filePaths.length;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> this.filePaths = filePaths;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.66"></a>
+<span class="sourceLineNo">067</span> if (!maintainPersistence) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> for (String filePath : filePaths) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> File file = new File(filePath);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (file.exists()) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (LOG.isDebugEnabled()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> file.delete();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> // If deletion fails still we can manage with the writes<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> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.79"></a>
+<span class="sourceLineNo">080</span> this.channelLocks = new ReentrantLock[filePaths.length];<a name="line.80"></a>
+<span class="sourceLineNo">081</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> String filePath = filePaths[i];<a name="line.82"></a>
+<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.84"></a>
+<span class="sourceLineNo">085</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (totalSpace < sizePerFile) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // The next setting length will throw exception,logging this message<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // is just used for the detail reason of exception，<a name="line.88"></a>
+<span class="sourceLineNo">089</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> + " total space under " + filePath + ", not enough for requested "<a name="line.90"></a>
+<span class="sourceLineNo">091</span> + StringUtils.byteDesc(sizePerFile);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> LOG.warn(msg);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span> rafs[i].setLength(sizePerFile);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> fileChannels[i] = rafs[i].getChannel();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> channelLocks[i] = new ReentrantLock();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.97"></a>
+<span class="sourceLineNo">098</span> + ", on the path:" + filePath);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> } catch (IOException fex) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> shutdown();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> throw fex;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> @Override<a name="line.107"></a>
+<span class="sourceLineNo">108</span> public String toString() {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.109"></a>
+<span class="sourceLineNo">110</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<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> * File IO engine is always able to support persistent storage for the cache<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return true<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean isPersistent() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return true;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Transfers data from file to the given byte buffer<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param offset The offset in the file where the first byte to be read<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param length The length of buffer that should be allocated for reading<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * from the file channel<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return number of bytes read<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @throws IOException<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Override<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (length != 0) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // the results are not corrupted before consuming them.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (dstBuffer.limit() != length) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.142"></a>
+<span class="sourceLineNo">143</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> @VisibleForTesting<a name="line.149"></a>
+<span class="sourceLineNo">150</span> void closeFileChannels() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (FileChannel fileChannel: fileChannels) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> fileChannel.close();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> } catch (IOException e) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.warn("Failed to close FileChannel", e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Transfers data from the given byte buffer to file<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @param offset The offset in the file where the first byte to be written<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @throws IOException<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (!srcBuffer.hasRemaining()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> accessFile(writeAccessor, srcBuffer, offset);<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> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Sync the data to file after writing<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @throws IOException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void sync() throws IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> try {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (fileChannels[i] != null) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> fileChannels[i].force(true);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> } catch (IOException ie) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throw ie;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Close the file<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public void shutdown() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> try {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (fileChannels[i] != null) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> fileChannels[i].close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (rafs[i] != null) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> rafs[i].close();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> } catch (IOException ex) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> assert srcBuffer.hasArray();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.215"></a>
+<span class="sourceLineNo">216</span> srcBuffer.remaining()), offset);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.219"></a>
+<span class="sourceLineNo">220</span> long globalOffset) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> int startFileNum = getFileNum(globalOffset);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> int remainingAccessDataLen = buffer.remaining();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> int accessFileNum = startFileNum;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> int bufLimit = buffer.limit();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> while (true) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.228"></a>
+<span class="sourceLineNo">229</span> int accessLen = 0;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (endFileNum > accessFileNum) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> // short the limit;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.232"></a>
+<span class="sourceLineNo">233</span> + sizePerFile - accessOffset));<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> } catch (ClosedByInterruptException e) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> throw e;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } catch (ClosedChannelException e) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> refreshFileConnection(accessFileNum, e);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> continue;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // recover the limit<a name="line.243"></a>
+<span class="sourceLineNo">244</span> buffer.limit(bufLimit);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (accessLen < remainingAccessDataLen) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> remainingAccessDataLen -= accessLen;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> accessFileNum++;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> accessOffset = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> break;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (accessFileNum >= fileChannels.length) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.254"></a>
+<span class="sourceLineNo">255</span> + globalOffset);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * Get the absolute offset in given file with the relative global offset.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param fileNum<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @param globalOffset<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return the absolute offset<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return globalOffset - fileNum * sizePerFile;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> private int getFileNum(long offset) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> if (offset < 0) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> int fileNum = (int) (offset / sizePerFile);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (fileNum >= fileChannels.length) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new RuntimeException("Not expected offset " + offset<a name="line.276"></a>
+<span class="sourceLineNo">277</span> + " where capacity=" + capacity);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return fileNum;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> @VisibleForTesting<a name="line.282"></a>
+<span class="sourceLineNo">283</span> FileChannel[] getFileChannels() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return fileChannels;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> @VisibleForTesting<a name="line.287"></a>
+<span class="sourceLineNo">288</span> void refreshFileConnection(int accessFileNum, IOException ioe) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> ReentrantLock channelLock = channelLocks[accessFileNum];<a name="line.289"></a>
+<span class="sourceLineNo">290</span> channelLock.lock();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> try {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (fileChannel != null) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // Don't re-open a channel if we were waiting on another<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // thread to re-open the channel and it is now open.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (fileChannel.isOpen()) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> fileChannel.close();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file: "<a name="line.301"></a>
+<span class="sourceLineNo">302</span> + filePaths[accessFileNum], ioe);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> } finally{<a name="line.305"></a>
+<span class="sourceLineNo">306</span> channelLock.unlock();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> private static interface FileAccessor {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.311"></a>
+<span class="sourceLineNo">312</span> throws IOException;<a name="line.312"></a>
<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>}<a name="line.314"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> private static class FileReadAccessor implements FileAccessor {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> long accessOffset) throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Override<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long accessOffset) throws IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return fileChannel.write(byteBuffer, accessOffset);<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>}<a name="line.330"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
index 7e3039a..65b5edb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html
@@ -1421,155 +1421,172 @@
<span class="sourceLineNo">1413</span> // after the cluster restart.<a name="line.1413"></a>
<span class="sourceLineNo">1414</span> Set<String> oldHostsNoLongerPresent = Sets.newTreeSet();<a name="line.1414"></a>
<span class="sourceLineNo">1415</span><a name="line.1415"></a>
-<span class="sourceLineNo">1416</span> int numRandomAssignments = 0;<a name="line.1416"></a>
-<span class="sourceLineNo">1417</span> int numRetainedAssigments = 0;<a name="line.1417"></a>
+<span class="sourceLineNo">1416</span> // If the old servers aren't present, lets assign those regions later.<a name="line.1416"></a>
+<span class="sourceLineNo">1417</span> List<RegionInfo> randomAssignRegions = Lists.newArrayList();<a name="line.1417"></a>
<span class="sourceLineNo">1418</span><a name="line.1418"></a>
-<span class="sourceLineNo">1419</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1419"></a>
-<span class="sourceLineNo">1420</span><a name="line.1420"></a>
-<span class="sourceLineNo">1421</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1421"></a>
-<span class="sourceLineNo">1422</span> RegionInfo region = entry.getKey();<a name="line.1422"></a>
-<span class="sourceLineNo">1423</span> ServerName oldServerName = entry.getValue();<a name="line.1423"></a>
-<span class="sourceLineNo">1424</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1424"></a>
-<span class="sourceLineNo">1425</span> if (oldServerName != null) {<a name="line.1425"></a>
-<span class="sourceLineNo">1426</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1426"></a>
-<span class="sourceLineNo">1427</span> }<a name="line.1427"></a>
-<span class="sourceLineNo">1428</span> if (localServers.isEmpty()) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> // No servers on the new cluster match up with this hostname,<a name="line.1429"></a>
-<span class="sourceLineNo">1430</span> // assign randomly.<a name="line.1430"></a>
-<span class="sourceLineNo">1431</span> ServerName randomServer = randomAssignment(cluster, region, servers);<a name="line.1431"></a>
-<span class="sourceLineNo">1432</span> assignments.get(randomServer).add(region);<a name="line.1432"></a>
-<span class="sourceLineNo">1433</span> numRandomAssignments++;<a name="line.1433"></a>
-<span class="sourceLineNo">1434</span> if (oldServerName != null) oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> } else if (localServers.size() == 1) {<a name="line.1435"></a>
-<span class="sourceLineNo">1436</span> // the usual case - one new server on same host<a name="line.1436"></a>
-<span class="sourceLineNo">1437</span> ServerName target = localServers.get(0);<a name="line.1437"></a>
-<span class="sourceLineNo">1438</span> assignments.get(target).add(region);<a name="line.1438"></a>
-<span class="sourceLineNo">1439</span> cluster.doAssignRegion(region, target);<a name="line.1439"></a>
-<span class="sourceLineNo">1440</span> numRetainedAssigments++;<a name="line.1440"></a>
-<span class="sourceLineNo">1441</span> } else {<a name="line.1441"></a>
-<span class="sourceLineNo">1442</span> // multiple new servers in the cluster on this same host<a name="line.1442"></a>
-<span class="sourceLineNo">1443</span> if (localServers.contains(oldServerName)) {<a name="line.1443"></a>
-<span class="sourceLineNo">1444</span> assignments.get(oldServerName).add(region);<a name="line.1444"></a>
-<span class="sourceLineNo">1445</span> cluster.doAssignRegion(region, oldServerName);<a name="line.1445"></a>
-<span class="sourceLineNo">1446</span> } else {<a name="line.1446"></a>
-<span class="sourceLineNo">1447</span> ServerName target = null;<a name="line.1447"></a>
-<span class="sourceLineNo">1448</span> for (ServerName tmp: localServers) {<a name="line.1448"></a>
-<span class="sourceLineNo">1449</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1449"></a>
-<span class="sourceLineNo">1450</span> target = tmp;<a name="line.1450"></a>
-<span class="sourceLineNo">1451</span> break;<a name="line.1451"></a>
-<span class="sourceLineNo">1452</span> }<a name="line.1452"></a>
-<span class="sourceLineNo">1453</span> }<a name="line.1453"></a>
-<span class="sourceLineNo">1454</span> if (target == null) {<a name="line.1454"></a>
-<span class="sourceLineNo">1455</span> target = randomAssignment(cluster, region, localServers);<a name="line.1455"></a>
+<span class="sourceLineNo">1419</span> int numRandomAssignments = 0;<a name="line.1419"></a>
+<span class="sourceLineNo">1420</span> int numRetainedAssigments = 0;<a name="line.1420"></a>
+<span class="sourceLineNo">1421</span><a name="line.1421"></a>
+<span class="sourceLineNo">1422</span> Cluster cluster = createCluster(servers, regions.keySet(), true);<a name="line.1422"></a>
+<span class="sourceLineNo">1423</span><a name="line.1423"></a>
+<span class="sourceLineNo">1424</span> for (Map.Entry<RegionInfo, ServerName> entry : regions.entrySet()) {<a name="line.1424"></a>
+<span class="sourceLineNo">1425</span> RegionInfo region = entry.getKey();<a name="line.1425"></a>
+<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
+<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
+<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
+<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
+<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
+<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
+<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
+<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
+<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
+<span class="sourceLineNo">1439</span> ServerName target = localServers.get(0);<a name="line.1439"></a>
+<span class="sourceLineNo">1440</span> assignments.get(target).add(region);<a name="line.1440"></a>
+<span class="sourceLineNo">1441</span> numRetainedAssigments++;<a name="line.1441"></a>
+<span class="sourceLineNo">1442</span> } else {<a name="line.1442"></a>
+<span class="sourceLineNo">1443</span> // multiple new servers in the cluster on this same host<a name="line.1443"></a>
+<span class="sourceLineNo">1444</span> if (localServers.contains(oldServerName)) {<a name="line.1444"></a>
+<span class="sourceLineNo">1445</span> assignments.get(oldServerName).add(region);<a name="line.1445"></a>
+<span class="sourceLineNo">1446</span> numRetainedAssigments++;<a name="line.1446"></a>
+<span class="sourceLineNo">1447</span> } else {<a name="line.1447"></a>
+<span class="sourceLineNo">1448</span> ServerName target = null;<a name="line.1448"></a>
+<span class="sourceLineNo">1449</span> for (ServerName tmp : localServers) {<a name="line.1449"></a>
+<span class="sourceLineNo">1450</span> if (tmp.getPort() == oldServerName.getPort()) {<a name="line.1450"></a>
+<span class="sourceLineNo">1451</span> target = tmp;<a name="line.1451"></a>
+<span class="sourceLineNo">1452</span> assignments.get(tmp).add(region);<a name="line.1452"></a>
+<span class="sourceLineNo">1453</span> numRetainedAssigments++;<a name="line.1453"></a>
+<span class="sourceLineNo">1454</span> break;<a name="line.1454"></a>
+<span class="sourceLineNo">1455</span> }<a name="line.1455"></a>
<span class="sourceLineNo">1456</span> }<a name="line.1456"></a>
-<span class="sourceLineNo">1457</span> assignments.get(target).add(region);<a name="line.1457"></a>
-<span class="sourceLineNo">1458</span> }<a name="line.1458"></a>
-<span class="sourceLineNo">1459</span> numRetainedAssigments++;<a name="line.1459"></a>
-<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
-<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
-<span class="sourceLineNo">1462</span><a name="line.1462"></a>
-<span class="sourceLineNo">1463</span> String randomAssignMsg = "";<a name="line.1463"></a>
-<span class="sourceLineNo">1464</span> if (numRandomAssignments > 0) {<a name="line.1464"></a>
-<span class="sourceLineNo">1465</span> randomAssignMsg =<a name="line.1465"></a>
-<span class="sourceLineNo">1466</span> numRandomAssignments + " regions were assigned "<a name="line.1466"></a>
-<span class="sourceLineNo">1467</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1467"></a>
-<span class="sourceLineNo">1468</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1468"></a>
-<span class="sourceLineNo">1469</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1469"></a>
-<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
-<span class="sourceLineNo">1471</span><a name="line.1471"></a>
-<span class="sourceLineNo">1472</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1472"></a>
-<span class="sourceLineNo">1473</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1473"></a>
-<span class="sourceLineNo">1474</span> return assignments;<a name="line.1474"></a>
-<span class="sourceLineNo">1475</span> }<a name="line.1475"></a>
-<span class="sourceLineNo">1476</span><a name="line.1476"></a>
-<span class="sourceLineNo">1477</span> @Override<a name="line.1477"></a>
-<span class="sourceLineNo">1478</span> public void initialize() throws HBaseIOException{<a name="line.1478"></a>
-<span class="sourceLineNo">1479</span> }<a name="line.1479"></a>
-<span class="sourceLineNo">1480</span><a name="line.1480"></a>
-<span class="sourceLineNo">1481</span> @Override<a name="line.1481"></a>
-<span class="sourceLineNo">1482</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1482"></a>
-<span class="sourceLineNo">1483</span> }<a name="line.1483"></a>
-<span class="sourceLineNo">1484</span><a name="line.1484"></a>
-<span class="sourceLineNo">1485</span> @Override<a name="line.1485"></a>
-<span class="sourceLineNo">1486</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1486"></a>
-<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
+<span class="sourceLineNo">1457</span> if (target == null) {<a name="line.1457"></a>
+<span class="sourceLineNo">1458</span> randomAssignRegions.add(region);<a name="line.1458"></a>
+<span class="sourceLineNo">1459</span> }<a name="line.1459"></a>
+<span class="sourceLineNo">1460</span> }<a name="line.1460"></a>
+<span class="sourceLineNo">1461</span> }<a name="line.1461"></a>
+<span class="sourceLineNo">1462</span> }<a name="line.1462"></a>
+<span class="sourceLineNo">1463</span><a name="line.1463"></a>
+<span class="sourceLineNo">1464</span> // If servers from prior assignment aren't present, then lets do randomAssignment on regions.<a name="line.1464"></a>
+<span class="sourceLineNo">1465</span> if (randomAssignRegions.size() > 0) {<a name="line.1465"></a>
+<span class="sourceLineNo">1466</span> for (Map.Entry<ServerName, List<RegionInfo>> entry : assignments.entrySet()) {<a name="line.1466"></a>
+<span class="sourceLineNo">1467</span> ServerName sn = entry.getKey();<a name="line.1467"></a>
+<span class="sourceLineNo">1468</span> for (RegionInfo region : entry.getValue()) {<a name="line.1468"></a>
+<span class="sourceLineNo">1469</span> cluster.doAssignRegion(region, sn);<a name="line.1469"></a>
+<span class="sourceLineNo">1470</span> }<a name="line.1470"></a>
+<span class="sourceLineNo">1471</span> }<a name="line.1471"></a>
+<span class="sourceLineNo">1472</span> for (RegionInfo region : randomAssignRegions) {<a name="line.1472"></a>
+<span class="sourceLineNo">1473</span> ServerName target = randomAssignment(cluster, region, servers);<a name="line.1473"></a>
+<span class="sourceLineNo">1474</span> assignments.get(target).add(region);<a name="line.1474"></a>
+<span class="sourceLineNo">1475</span> cluster.doAssignRegion(region, target);<a name="line.1475"></a>
+<span class="sourceLineNo">1476</span> numRandomAssignments++;<a name="line.1476"></a>
+<span class="sourceLineNo">1477</span> }<a name="line.1477"></a>
+<span class="sourceLineNo">1478</span> }<a name="line.1478"></a>
+<span class="sourceLineNo">1479</span><a name="line.1479"></a>
+<span class="sourceLineNo">1480</span> String randomAssignMsg = "";<a name="line.1480"></a>
+<span class="sourceLineNo">1481</span> if (numRandomAssignments > 0) {<a name="line.1481"></a>
+<span class="sourceLineNo">1482</span> randomAssignMsg =<a name="line.1482"></a>
+<span class="sourceLineNo">1483</span> numRandomAssignments + " regions were assigned "<a name="line.1483"></a>
+<span class="sourceLineNo">1484</span> + "to random hosts, since the old hosts for these regions are no "<a name="line.1484"></a>
+<span class="sourceLineNo">1485</span> + "longer present in the cluster. These hosts were:\n "<a name="line.1485"></a>
+<span class="sourceLineNo">1486</span> + Joiner.on("\n ").join(oldHostsNoLongerPresent);<a name="line.1486"></a>
+<span class="sourceLineNo">1487</span> }<a name="line.1487"></a>
<span class="sourceLineNo">1488</span><a name="line.1488"></a>
-<span class="sourceLineNo">1489</span> @Override<a name="line.1489"></a>
-<span class="sourceLineNo">1490</span> public boolean isStopped() {<a name="line.1490"></a>
-<span class="sourceLineNo">1491</span> return stopped;<a name="line.1491"></a>
+<span class="sourceLineNo">1489</span> LOG.info("Reassigned " + regions.size() + " regions. " + numRetainedAssigments<a name="line.1489"></a>
+<span class="sourceLineNo">1490</span> + " retained the pre-restart assignment. " + randomAssignMsg);<a name="line.1490"></a>
+<span class="sourceLineNo">1491</span> return assignments;<a name="line.1491"></a>
<span class="sourceLineNo">1492</span> }<a name="line.1492"></a>
<span class="sourceLineNo">1493</span><a name="line.1493"></a>
<span class="sourceLineNo">1494</span> @Override<a name="line.1494"></a>
-<span class="sourceLineNo">1495</span> public void stop(String why) {<a name="line.1495"></a>
-<span class="sourceLineNo">1496</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1496"></a>
-<span class="sourceLineNo">1497</span> stopped = true;<a name="line.1497"></a>
-<span class="sourceLineNo">1498</span> }<a name="line.1498"></a>
-<span class="sourceLineNo">1499</span><a name="line.1499"></a>
-<span class="sourceLineNo">1500</span> /**<a name="line.1500"></a>
-<span class="sourceLineNo">1501</span> * Used to assign a single region to a random server.<a name="line.1501"></a>
-<span class="sourceLineNo">1502</span> */<a name="line.1502"></a>
-<span class="sourceLineNo">1503</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1503"></a>
-<span class="sourceLineNo">1504</span> List<ServerName> servers) {<a name="line.1504"></a>
-<span class="sourceLineNo">1505</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1505"></a>
-<span class="sourceLineNo">1506</span> ServerName sn = null;<a name="line.1506"></a>
-<span class="sourceLineNo">1507</span> final int maxIterations = numServers * 4;<a name="line.1507"></a>
-<span class="sourceLineNo">1508</span> int iterations = 0;<a name="line.1508"></a>
-<span class="sourceLineNo">1509</span><a name="line.1509"></a>
-<span class="sourceLineNo">1510</span> do {<a name="line.1510"></a>
-<span class="sourceLineNo">1511</span> int i = RANDOM.nextInt(numServers);<a name="line.1511"></a>
-<span class="sourceLineNo">1512</span> sn = servers.get(i);<a name="line.1512"></a>
-<span class="sourceLineNo">1513</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1513"></a>
-<span class="sourceLineNo">1514</span> && iterations++ < maxIterations);<a name="line.1514"></a>
-<span class="sourceLineNo">1515</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1515"></a>
-<span class="sourceLineNo">1516</span> return sn;<a name="line.1516"></a>
-<span class="sourceLineNo">1517</span> }<a name="line.1517"></a>
-<span class="sourceLineNo">1518</span><a name="line.1518"></a>
-<span class="sourceLineNo">1519</span> /**<a name="line.1519"></a>
-<span class="sourceLineNo">1520</span> * Round robin a list of regions to a list of servers<a name="line.1520"></a>
-<span class="sourceLineNo">1521</span> */<a name="line.1521"></a>
-<span class="sourceLineNo">1522</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1522"></a>
-<span class="sourceLineNo">1523</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1523"></a>
-<span class="sourceLineNo">1524</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1524"></a>
-<span class="sourceLineNo">1525</span><a name="line.1525"></a>
-<span class="sourceLineNo">1526</span> int numServers = servers.size();<a name="line.1526"></a>
-<span class="sourceLineNo">1527</span> int numRegions = regions.size();<a name="line.1527"></a>
-<span class="sourceLineNo">1528</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1528"></a>
-<span class="sourceLineNo">1529</span> int serverIdx = 0;<a name="line.1529"></a>
-<span class="sourceLineNo">1530</span> if (numServers > 1) {<a name="line.1530"></a>
-<span class="sourceLineNo">1531</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1531"></a>
-<span class="sourceLineNo">1532</span> }<a name="line.1532"></a>
-<span class="sourceLineNo">1533</span> int regionIdx = 0;<a name="line.1533"></a>
-<span class="sourceLineNo">1534</span><a name="line.1534"></a>
-<span class="sourceLineNo">1535</span> for (int j = 0; j < numServers; j++) {<a name="line.1535"></a>
-<span class="sourceLineNo">1536</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1536"></a>
-<span class="sourceLineNo">1537</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1537"></a>
-<span class="sourceLineNo">1538</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1538"></a>
-<span class="sourceLineNo">1539</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1539"></a>
-<span class="sourceLineNo">1540</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1540"></a>
-<span class="sourceLineNo">1541</span> unassignedRegions.add(region);<a name="line.1541"></a>
-<span class="sourceLineNo">1542</span> } else {<a name="line.1542"></a>
-<span class="sourceLineNo">1543</span> serverRegions.add(region);<a name="line.1543"></a>
-<span class="sourceLineNo">1544</span> cluster.doAssignRegion(region, server);<a name="line.1544"></a>
-<span class="sourceLineNo">1545</span> }<a name="line.1545"></a>
-<span class="sourceLineNo">1546</span> }<a name="line.1546"></a>
-<span class="sourceLineNo">1547</span> assignments.put(server, serverRegions);<a name="line.1547"></a>
-<span class="sourceLineNo">1548</span> regionIdx++;<a name="line.1548"></a>
+<span class="sourceLineNo">1495</span> public void initialize() throws HBaseIOException{<a name="line.1495"></a>
+<span class="sourceLineNo">1496</span> }<a name="line.1496"></a>
+<span class="sourceLineNo">1497</span><a name="line.1497"></a>
+<span class="sourceLineNo">1498</span> @Override<a name="line.1498"></a>
+<span class="sourceLineNo">1499</span> public void regionOnline(RegionInfo regionInfo, ServerName sn) {<a name="line.1499"></a>
+<span class="sourceLineNo">1500</span> }<a name="line.1500"></a>
+<span class="sourceLineNo">1501</span><a name="line.1501"></a>
+<span class="sourceLineNo">1502</span> @Override<a name="line.1502"></a>
+<span class="sourceLineNo">1503</span> public void regionOffline(RegionInfo regionInfo) {<a name="line.1503"></a>
+<span class="sourceLineNo">1504</span> }<a name="line.1504"></a>
+<span class="sourceLineNo">1505</span><a name="line.1505"></a>
+<span class="sourceLineNo">1506</span> @Override<a name="line.1506"></a>
+<span class="sourceLineNo">1507</span> public boolean isStopped() {<a name="line.1507"></a>
+<span class="sourceLineNo">1508</span> return stopped;<a name="line.1508"></a>
+<span class="sourceLineNo">1509</span> }<a name="line.1509"></a>
+<span class="sourceLineNo">1510</span><a name="line.1510"></a>
+<span class="sourceLineNo">1511</span> @Override<a name="line.1511"></a>
+<span class="sourceLineNo">1512</span> public void stop(String why) {<a name="line.1512"></a>
+<span class="sourceLineNo">1513</span> LOG.info("Load Balancer stop requested: "+why);<a name="line.1513"></a>
+<span class="sourceLineNo">1514</span> stopped = true;<a name="line.1514"></a>
+<span class="sourceLineNo">1515</span> }<a name="line.1515"></a>
+<span class="sourceLineNo">1516</span><a name="line.1516"></a>
+<span class="sourceLineNo">1517</span> /**<a name="line.1517"></a>
+<span class="sourceLineNo">1518</span> * Used to assign a single region to a random server.<a name="line.1518"></a>
+<span class="sourceLineNo">1519</span> */<a name="line.1519"></a>
+<span class="sourceLineNo">1520</span> private ServerName randomAssignment(Cluster cluster, RegionInfo regionInfo,<a name="line.1520"></a>
+<span class="sourceLineNo">1521</span> List<ServerName> servers) {<a name="line.1521"></a>
+<span class="sourceLineNo">1522</span> int numServers = servers.size(); // servers is not null, numServers > 1<a name="line.1522"></a>
+<span class="sourceLineNo">1523</span> ServerName sn = null;<a name="line.1523"></a>
+<span class="sourceLineNo">1524</span> final int maxIterations = numServers * 4;<a name="line.1524"></a>
+<span class="sourceLineNo">1525</span> int iterations = 0;<a name="line.1525"></a>
+<span class="sourceLineNo">1526</span><a name="line.1526"></a>
+<span class="sourceLineNo">1527</span> do {<a name="line.1527"></a>
+<span class="sourceLineNo">1528</span> int i = RANDOM.nextInt(numServers);<a name="line.1528"></a>
+<span class="sourceLineNo">1529</span> sn = servers.get(i);<a name="line.1529"></a>
+<span class="sourceLineNo">1530</span> } while (cluster.wouldLowerAvailability(regionInfo, sn)<a name="line.1530"></a>
+<span class="sourceLineNo">1531</span> && iterations++ < maxIterations);<a name="line.1531"></a>
+<span class="sourceLineNo">1532</span> cluster.doAssignRegion(regionInfo, sn);<a name="line.1532"></a>
+<span class="sourceLineNo">1533</span> return sn;<a name="line.1533"></a>
+<span class="sourceLineNo">1534</span> }<a name="line.1534"></a>
+<span class="sourceLineNo">1535</span><a name="line.1535"></a>
+<span class="sourceLineNo">1536</span> /**<a name="line.1536"></a>
+<span class="sourceLineNo">1537</span> * Round robin a list of regions to a list of servers<a name="line.1537"></a>
+<span class="sourceLineNo">1538</span> */<a name="line.1538"></a>
+<span class="sourceLineNo">1539</span> private void roundRobinAssignment(Cluster cluster, List<RegionInfo> regions,<a name="line.1539"></a>
+<span class="sourceLineNo">1540</span> List<RegionInfo> unassignedRegions, List<ServerName> servers,<a name="line.1540"></a>
+<span class="sourceLineNo">1541</span> Map<ServerName, List<RegionInfo>> assignments) {<a name="line.1541"></a>
+<span class="sourceLineNo">1542</span><a name="line.1542"></a>
+<span class="sourceLineNo">1543</span> int numServers = servers.size();<a name="line.1543"></a>
+<span class="sourceLineNo">1544</span> int numRegions = regions.size();<a name="line.1544"></a>
+<span class="sourceLineNo">1545</span> int max = (int) Math.ceil((float) numRegions / numServers);<a name="line.1545"></a>
+<span class="sourceLineNo">1546</span> int serverIdx = 0;<a name="line.1546"></a>
+<span class="sourceLineNo">1547</span> if (numServers > 1) {<a name="line.1547"></a>
+<span class="sourceLineNo">1548</span> serverIdx = RANDOM.nextInt(numServers);<a name="line.1548"></a>
<span class="sourceLineNo">1549</span> }<a name="line.1549"></a>
-<span class="sourceLineNo">1550</span> }<a name="line.1550"></a>
+<span class="sourceLineNo">1550</span> int regionIdx = 0;<a name="line.1550"></a>
<span class="sourceLineNo">1551</span><a name="line.1551"></a>
-<span class="sourceLineNo">1552</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1552"></a>
-<span class="sourceLineNo">1553</span> Collection<RegionInfo> regions) {<a name="line.1553"></a>
-<span class="sourceLineNo">1554</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1554"></a>
-<span class="sourceLineNo">1555</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1555"></a>
-<span class="sourceLineNo">1556</span> } else {<a name="line.1556"></a>
-<span class="sourceLineNo">1557</span> return new HashMap<>();<a name="line.1557"></a>
-<span class="sourceLineNo">1558</span> }<a name="line.1558"></a>
-<span class="sourceLineNo">1559</span> }<a name="line.1559"></a>
-<span class="sourceLineNo">1560</span><a name="line.1560"></a>
-<span class="sourceLineNo">1561</span> @Override<a name="line.1561"></a>
-<span class="sourceLineNo">1562</span> public void onConfigurationChange(Configuration conf) {<a name="line.1562"></a>
-<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
-<span class="sourceLineNo">1564</span>}<a name="line.1564"></a>
+<span class="sourceLineNo">1552</span> for (int j = 0; j < numServers; j++) {<a name="line.1552"></a>
+<span class="sourceLineNo">1553</span> ServerName server = servers.get((j + serverIdx) % numServers);<a name="line.1553"></a>
+<span class="sourceLineNo">1554</span> List<RegionInfo> serverRegions = new ArrayList<>(max);<a name="line.1554"></a>
+<span class="sourceLineNo">1555</span> for (int i = regionIdx; i < numRegions; i += numServers) {<a name="line.1555"></a>
+<span class="sourceLineNo">1556</span> RegionInfo region = regions.get(i % numRegions);<a name="line.1556"></a>
+<span class="sourceLineNo">1557</span> if (cluster.wouldLowerAvailability(region, server)) {<a name="line.1557"></a>
+<span class="sourceLineNo">1558</span> unassignedRegions.add(region);<a name="line.1558"></a>
+<span class="sourceLineNo">1559</span> } else {<a name="line.1559"></a>
+<span class="sourceLineNo">1560</span> serverRegions.add(region);<a name="line.1560"></a>
+<span class="sourceLineNo">1561</span> cluster.doAssignRegion(region, server);<a name="line.1561"></a>
+<span class="sourceLineNo">1562</span> }<a name="line.1562"></a>
+<span class="sourceLineNo">1563</span> }<a name="line.1563"></a>
+<span class="sourceLineNo">1564</span> assignments.put(server, serverRegions);<a name="line.1564"></a>
+<span class="sourceLineNo">1565</span> regionIdx++;<a name="line.1565"></a>
+<span class="sourceLineNo">1566</span> }<a name="line.1566"></a>
+<span class="sourceLineNo">1567</span> }<a name="line.1567"></a>
+<span class="sourceLineNo">1568</span><a name="line.1568"></a>
+<span class="sourceLineNo">1569</span> protected Map<ServerName, List<RegionInfo>> getRegionAssignmentsByServer(<a name="line.1569"></a>
+<span class="sourceLineNo">1570</span> Collection<RegionInfo> regions) {<a name="line.1570"></a>
+<span class="sourceLineNo">1571</span> if (this.services != null && this.services.getAssignmentManager() != null) {<a name="line.1571"></a>
+<span class="sourceLineNo">1572</span> return this.services.getAssignmentManager().getSnapShotOfAssignment(regions);<a name="line.1572"></a>
+<span class="sourceLineNo">1573</span> } else {<a name="line.1573"></a>
+<span class="sourceLineNo">1574</span> return new HashMap<>();<a name="line.1574"></a>
+<span class="sourceLineNo">1575</span> }<a name="line.1575"></a>
+<span class="sourceLineNo">1576</span> }<a name="line.1576"></a>
+<span class="sourceLineNo">1577</span><a name="line.1577"></a>
+<span class="sourceLineNo">1578</span> @Override<a name="line.1578"></a>
+<span class="sourceLineNo">1579</span> public void onConfigurationChange(Configuration conf) {<a name="line.1579"></a>
+<span class="sourceLineNo">1580</span> }<a name="line.1580"></a>
+<span class="sourceLineNo">1581</span>}<a name="line.1581"></a>
[27/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
index 3647d12..25faf76 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
@@ -34,292 +34,308 @@
<span class="sourceLineNo">026</span>import java.nio.channels.ClosedChannelException;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import java.nio.channels.FileChannel;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import java.util.Arrays;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.util.StringUtils;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * IO engine that stores data to a file on the local file system.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@InterfaceAudience.Private<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public class FileIOEngine implements IOEngine {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public static final String FILE_DELIMITER = ",";<a name="line.48"></a>
-<span class="sourceLineNo">049</span> private final String[] filePaths;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private final FileChannel[] fileChannels;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> private final RandomAccessFile[] rafs;<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private final long sizePerFile;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final long capacity;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.59"></a>
-<span class="sourceLineNo">060</span> throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> this.sizePerFile = capacity / filePaths.length;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> this.filePaths = filePaths;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (!maintainPersistence) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> for (String filePath : filePaths) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> File file = new File(filePath);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> if (file.exists()) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (LOG.isDebugEnabled()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> file.delete();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> // If deletion fails still we can manage with the writes<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> String filePath = filePaths[i];<a name="line.79"></a>
-<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.81"></a>
-<span class="sourceLineNo">082</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (totalSpace < sizePerFile) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // The next setting length will throw exception,logging this message<a name="line.84"></a>
-<span class="sourceLineNo">085</span> // is just used for the detail reason of exception，<a name="line.85"></a>
-<span class="sourceLineNo">086</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.86"></a>
-<span class="sourceLineNo">087</span> + " total space under " + filePath + ", not enough for requested "<a name="line.87"></a>
-<span class="sourceLineNo">088</span> + StringUtils.byteDesc(sizePerFile);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> LOG.warn(msg);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> rafs[i].setLength(sizePerFile);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> fileChannels[i] = rafs[i].getChannel();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.93"></a>
-<span class="sourceLineNo">094</span> + ", on the path:" + filePath);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> } catch (IOException fex) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> shutdown();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> throw fex;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public String toString() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.105"></a>
-<span class="sourceLineNo">106</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * File IO engine is always able to support persistent storage for the cache<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @return true<a name="line.111"></a>
-<span class="sourceLineNo">112</span> */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public boolean isPersistent() {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Transfers data from file to the given byte buffer<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param offset The offset in the file where the first byte to be read<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param length The length of buffer that should be allocated for reading<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * from the file channel<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @return number of bytes read<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @throws IOException<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (length != 0) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // the results are not corrupted before consuming them.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (dstBuffer.limit() != length) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.138"></a>
-<span class="sourceLineNo">139</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<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> @VisibleForTesting<a name="line.145"></a>
-<span class="sourceLineNo">146</span> void closeFileChannels() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> for (FileChannel fileChannel: fileChannels) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> fileChannel.close();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } catch (IOException e) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.warn("Failed to close FileChannel", e);<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> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * Transfers data from the given byte buffer to file<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * @param offset The offset in the file where the first byte to be written<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @throws IOException<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (!srcBuffer.hasRemaining()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> accessFile(writeAccessor, srcBuffer, offset);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Sync the data to file after writing<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @throws IOException<a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public void sync() throws IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (fileChannels[i] != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> fileChannels[i].force(true);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> } catch (IOException ie) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> throw ie;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Close the file<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void shutdown() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (fileChannels[i] != null) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> fileChannels[i].close();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (rafs[i] != null) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rafs[i].close();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } catch (IOException ex) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> assert srcBuffer.hasArray();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.211"></a>
-<span class="sourceLineNo">212</span> srcBuffer.remaining()), offset);<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">215</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.215"></a>
-<span class="sourceLineNo">216</span> long globalOffset) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> int startFileNum = getFileNum(globalOffset);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> int remainingAccessDataLen = buffer.remaining();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> int accessFileNum = startFileNum;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> int bufLimit = buffer.limit();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> while (true) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.224"></a>
-<span class="sourceLineNo">225</span> int accessLen = 0;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (endFileNum > accessFileNum) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // short the limit;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.228"></a>
-<span class="sourceLineNo">229</span> + sizePerFile - accessOffset));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span> try {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (ClosedByInterruptException e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> throw e;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> } catch (ClosedChannelException e) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file. ", e);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> refreshFileConnection(accessFileNum);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> continue;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // recover the limit<a name="line.240"></a>
-<span class="sourceLineNo">241</span> buffer.limit(bufLimit);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (accessLen < remainingAccessDataLen) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> remainingAccessDataLen -= accessLen;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> accessFileNum++;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> accessOffset = 0;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> break;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (accessFileNum >= fileChannels.length) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.250"></a>
-<span class="sourceLineNo">251</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.251"></a>
-<span class="sourceLineNo">252</span> + globalOffset);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Get the absolute offset in given file with the relative global offset.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * @param fileNum<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * @param globalOffset<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @return the absolute offset<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return globalOffset - fileNum * sizePerFile;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> private int getFileNum(long offset) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (offset < 0) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> int fileNum = (int) (offset / sizePerFile);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (fileNum >= fileChannels.length) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new RuntimeException("Not expected offset " + offset<a name="line.273"></a>
-<span class="sourceLineNo">274</span> + " where capacity=" + capacity);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> return fileNum;<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @VisibleForTesting<a name="line.279"></a>
-<span class="sourceLineNo">280</span> FileChannel[] getFileChannels() {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return fileChannels;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> @VisibleForTesting<a name="line.284"></a>
-<span class="sourceLineNo">285</span> void refreshFileConnection(int accessFileNum) throws IOException {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (fileChannel != null) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> fileChannel.close();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private static interface FileAccessor {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.295"></a>
-<span class="sourceLineNo">296</span> throws IOException;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> private static class FileReadAccessor implements FileAccessor {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.301"></a>
-<span class="sourceLineNo">302</span> long accessOffset) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
-<span class="sourceLineNo">309</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> long accessOffset) throws IOException {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> return fileChannel.write(byteBuffer, accessOffset);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">029</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.util.StringUtils;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * IO engine that stores data to a file on the local file system.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public class FileIOEngine implements IOEngine {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public static final String FILE_DELIMITER = ",";<a name="line.49"></a>
+<span class="sourceLineNo">050</span> private final String[] filePaths;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private final FileChannel[] fileChannels;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private final RandomAccessFile[] rafs;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final ReentrantLock[] channelLocks;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private final long sizePerFile;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private final long capacity;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> throws IOException {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.sizePerFile = capacity / filePaths.length;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> this.filePaths = filePaths;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.66"></a>
+<span class="sourceLineNo">067</span> if (!maintainPersistence) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> for (String filePath : filePaths) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> File file = new File(filePath);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (file.exists()) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (LOG.isDebugEnabled()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> file.delete();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> // If deletion fails still we can manage with the writes<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> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.79"></a>
+<span class="sourceLineNo">080</span> this.channelLocks = new ReentrantLock[filePaths.length];<a name="line.80"></a>
+<span class="sourceLineNo">081</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> String filePath = filePaths[i];<a name="line.82"></a>
+<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.84"></a>
+<span class="sourceLineNo">085</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (totalSpace < sizePerFile) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // The next setting length will throw exception,logging this message<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // is just used for the detail reason of exception，<a name="line.88"></a>
+<span class="sourceLineNo">089</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> + " total space under " + filePath + ", not enough for requested "<a name="line.90"></a>
+<span class="sourceLineNo">091</span> + StringUtils.byteDesc(sizePerFile);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> LOG.warn(msg);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span> rafs[i].setLength(sizePerFile);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> fileChannels[i] = rafs[i].getChannel();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> channelLocks[i] = new ReentrantLock();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.97"></a>
+<span class="sourceLineNo">098</span> + ", on the path:" + filePath);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> } catch (IOException fex) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> shutdown();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> throw fex;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> @Override<a name="line.107"></a>
+<span class="sourceLineNo">108</span> public String toString() {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.109"></a>
+<span class="sourceLineNo">110</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<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> * File IO engine is always able to support persistent storage for the cache<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return true<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean isPersistent() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return true;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Transfers data from file to the given byte buffer<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param offset The offset in the file where the first byte to be read<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param length The length of buffer that should be allocated for reading<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * from the file channel<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return number of bytes read<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @throws IOException<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Override<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (length != 0) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // the results are not corrupted before consuming them.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (dstBuffer.limit() != length) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.142"></a>
+<span class="sourceLineNo">143</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> @VisibleForTesting<a name="line.149"></a>
+<span class="sourceLineNo">150</span> void closeFileChannels() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (FileChannel fileChannel: fileChannels) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> fileChannel.close();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> } catch (IOException e) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.warn("Failed to close FileChannel", e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Transfers data from the given byte buffer to file<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @param offset The offset in the file where the first byte to be written<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @throws IOException<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (!srcBuffer.hasRemaining()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> accessFile(writeAccessor, srcBuffer, offset);<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> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Sync the data to file after writing<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @throws IOException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void sync() throws IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> try {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (fileChannels[i] != null) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> fileChannels[i].force(true);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> } catch (IOException ie) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throw ie;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Close the file<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public void shutdown() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> try {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (fileChannels[i] != null) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> fileChannels[i].close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (rafs[i] != null) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> rafs[i].close();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> } catch (IOException ex) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> assert srcBuffer.hasArray();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.215"></a>
+<span class="sourceLineNo">216</span> srcBuffer.remaining()), offset);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.219"></a>
+<span class="sourceLineNo">220</span> long globalOffset) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> int startFileNum = getFileNum(globalOffset);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> int remainingAccessDataLen = buffer.remaining();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> int accessFileNum = startFileNum;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> int bufLimit = buffer.limit();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> while (true) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.228"></a>
+<span class="sourceLineNo">229</span> int accessLen = 0;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (endFileNum > accessFileNum) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> // short the limit;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.232"></a>
+<span class="sourceLineNo">233</span> + sizePerFile - accessOffset));<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> } catch (ClosedByInterruptException e) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> throw e;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } catch (ClosedChannelException e) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> refreshFileConnection(accessFileNum, e);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> continue;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // recover the limit<a name="line.243"></a>
+<span class="sourceLineNo">244</span> buffer.limit(bufLimit);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (accessLen < remainingAccessDataLen) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> remainingAccessDataLen -= accessLen;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> accessFileNum++;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> accessOffset = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> break;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (accessFileNum >= fileChannels.length) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.254"></a>
+<span class="sourceLineNo">255</span> + globalOffset);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * Get the absolute offset in given file with the relative global offset.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param fileNum<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @param globalOffset<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return the absolute offset<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return globalOffset - fileNum * sizePerFile;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> private int getFileNum(long offset) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> if (offset < 0) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> int fileNum = (int) (offset / sizePerFile);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (fileNum >= fileChannels.length) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new RuntimeException("Not expected offset " + offset<a name="line.276"></a>
+<span class="sourceLineNo">277</span> + " where capacity=" + capacity);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return fileNum;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> @VisibleForTesting<a name="line.282"></a>
+<span class="sourceLineNo">283</span> FileChannel[] getFileChannels() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return fileChannels;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> @VisibleForTesting<a name="line.287"></a>
+<span class="sourceLineNo">288</span> void refreshFileConnection(int accessFileNum, IOException ioe) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> ReentrantLock channelLock = channelLocks[accessFileNum];<a name="line.289"></a>
+<span class="sourceLineNo">290</span> channelLock.lock();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> try {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (fileChannel != null) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // Don't re-open a channel if we were waiting on another<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // thread to re-open the channel and it is now open.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (fileChannel.isOpen()) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> fileChannel.close();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file: "<a name="line.301"></a>
+<span class="sourceLineNo">302</span> + filePaths[accessFileNum], ioe);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> } finally{<a name="line.305"></a>
+<span class="sourceLineNo">306</span> channelLock.unlock();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> private static interface FileAccessor {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.311"></a>
+<span class="sourceLineNo">312</span> throws IOException;<a name="line.312"></a>
<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>}<a name="line.314"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> private static class FileReadAccessor implements FileAccessor {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> long accessOffset) throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Override<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long accessOffset) throws IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return fileChannel.write(byteBuffer, accessOffset);<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>}<a name="line.330"></a>
[19/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.DirScanPool.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.DirScanPool.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.DirScanPool.html
index 41c0dae..f5ac8fc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.DirScanPool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.DirScanPool.html
@@ -280,303 +280,309 @@
<span class="sourceLineNo">272</span> try {<a name="line.272"></a>
<span class="sourceLineNo">273</span> POOL.latchCountUp();<a name="line.273"></a>
<span class="sourceLineNo">274</span> if (runCleaner()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> LOG.debug("Cleaned all WALs under {}", oldFileDir);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } else {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> LOG.warn("WALs outstanding under {}", oldFileDir);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> } finally {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> POOL.latchCountDown();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.282"></a>
-<span class="sourceLineNo">283</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.286"></a>
-<span class="sourceLineNo">287</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } else {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> LOG.debug("Cleaner chore disabled! Not cleaning.");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private void preRunCleaner() {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> public Boolean runCleaner() {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> preRunCleaner();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> POOL.submit(task);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return task.join();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Sort the given list in (descending) order of the space each element takes<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.307"></a>
-<span class="sourceLineNo">308</span> */<a name="line.308"></a>
-<span class="sourceLineNo">309</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (dirs == null || dirs.size() < 2) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> // no need to sort for empty or single directory<a name="line.311"></a>
-<span class="sourceLineNo">312</span> return;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> long f1ConsumedSpace = getSpace(f1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> long f2ConsumedSpace = getSpace(f2);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> private long getSpace(FileStatus f) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> Long cached = directorySpaces.get(f);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> if (cached != null) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> return cached;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> try {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> long space =<a name="line.330"></a>
-<span class="sourceLineNo">331</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.331"></a>
-<span class="sourceLineNo">332</span> directorySpaces.put(f, space);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> return space;<a name="line.333"></a>
-<span class="sourceLineNo">334</span> } catch (IOException e) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return -1;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> });<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> /**<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * necessary.<a name="line.344"></a>
-<span class="sourceLineNo">345</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * @return true iff successfully deleted all files<a name="line.346"></a>
-<span class="sourceLineNo">347</span> */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (files == null) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return true;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // first check to see if the path is valid<a name="line.353"></a>
-<span class="sourceLineNo">354</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.354"></a>
-<span class="sourceLineNo">355</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> for (FileStatus file : files) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (validate(file.getPath())) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> validFiles.add(file);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> } else {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.360"></a>
-<span class="sourceLineNo">361</span> invalidFiles.add(file);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> // check each of the cleaners for the valid files<a name="line.366"></a>
-<span class="sourceLineNo">367</span> for (T cleaner : cleanersChain) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.369"></a>
-<span class="sourceLineNo">370</span> + this.oldFileDir);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return false;<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> // trace which cleaner is holding on to each file<a name="line.376"></a>
-<span class="sourceLineNo">377</span> if (LOG.isTraceEnabled()) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> for (FileStatus file : deletableValidFiles) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (!filteredFileSet.contains(file)) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> }<a name="line.384"></a>
-<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> deletableValidFiles = filteredFiles;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> return deleteFiles(filesToDelete) == files.size();<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * Delete the given files<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * @param filesToDelete files to delete<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * @return number of deleted files<a name="line.396"></a>
-<span class="sourceLineNo">397</span> */<a name="line.397"></a>
-<span class="sourceLineNo">398</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> int deletedFileCount = 0;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> for (FileStatus file : filesToDelete) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> Path filePath = file.getPath();<a name="line.401"></a>
-<span class="sourceLineNo">402</span> LOG.trace("Removing {} from archive", filePath);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> try {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> boolean success = this.fs.delete(filePath, false);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> if (success) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> deletedFileCount++;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> } else {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> LOG.warn("Attempted to delete:" + filePath<a name="line.408"></a>
-<span class="sourceLineNo">409</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (IOException e) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> e = e instanceof RemoteException ?<a name="line.412"></a>
-<span class="sourceLineNo">413</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span> return deletedFileCount;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> @Override<a name="line.420"></a>
-<span class="sourceLineNo">421</span> public synchronized void cleanup() {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> for (T lc : this.cleanersChain) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> try {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> lc.stop("Exiting");<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } catch (Throwable t) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> LOG.warn("Stopping", t);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> @VisibleForTesting<a name="line.431"></a>
-<span class="sourceLineNo">432</span> int getChorePoolSize() {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> return POOL.size;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * @param enabled<a name="line.437"></a>
-<span class="sourceLineNo">438</span> */<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public boolean setEnabled(final boolean enabled) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return this.enabled.getAndSet(enabled);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> public boolean getEnabled() { return this.enabled.get();<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> private interface Action<T> {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> T act() throws IOException;<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.451"></a>
-<span class="sourceLineNo">452</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.452"></a>
-<span class="sourceLineNo">453</span> */<a name="line.453"></a>
-<span class="sourceLineNo">454</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> private final Path dir;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> private final boolean root;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> this(dir.getPath(), root);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> CleanerTask(final Path dir, final boolean root) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> this.dir = dir;<a name="line.463"></a>
-<span class="sourceLineNo">464</span> this.root = root;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> @Override<a name="line.467"></a>
-<span class="sourceLineNo">468</span> protected Boolean compute() {<a name="line.468"></a>
-<span class="sourceLineNo">469</span> LOG.debug("Cleaning under {}", dir);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> List<FileStatus> subDirs;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> List<FileStatus> files;<a name="line.471"></a>
-<span class="sourceLineNo">472</span> try {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.473"></a>
-<span class="sourceLineNo">474</span> // which will fall through to succeeding.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.475"></a>
-<span class="sourceLineNo">476</span> files = getFilteredStatus(status -> status.isFile());<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } catch (IOException ioe) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> return false;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> boolean nullSubDirs = subDirs == null;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (nullSubDirs) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> LOG.trace("There is no subdir under {}", dir);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> if (files == null) {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> LOG.trace("There is no file under {}", dir);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.490"></a>
-<span class="sourceLineNo">491</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> if (!nullSubDirs) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> sortByConsumedSpace(subDirs);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (FileStatus subdir : subDirs) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> tasks.add(task);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> task.fork();<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> boolean result = true;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.502"></a>
-<span class="sourceLineNo">503</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.504"></a>
-<span class="sourceLineNo">505</span> // it is not the root dir, then task will try to delete it.<a name="line.505"></a>
-<span class="sourceLineNo">506</span> if (result && !root) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> return result;<a name="line.509"></a>
-<span class="sourceLineNo">510</span> }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> /**<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * Get FileStatus with filter.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * even though status is empty but not null.<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * @param function a filter function<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @throws IOException if there's an error other than dir not existing<a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * Perform a delete on a specified type.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * @param deletion a delete<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * @return true if it deleted successfully, false otherwise<a name="line.528"></a>
-<span class="sourceLineNo">529</span> */<a name="line.529"></a>
-<span class="sourceLineNo">530</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.530"></a>
-<span class="sourceLineNo">531</span> boolean deleted;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> try {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> deleted = deletion.act();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.536"></a>
-<span class="sourceLineNo">537</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.537"></a>
-<span class="sourceLineNo">538</span> // message below.<a name="line.538"></a>
-<span class="sourceLineNo">539</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.539"></a>
-<span class="sourceLineNo">540</span> "exception details at TRACE.", dir);<a name="line.540"></a>
-<span class="sourceLineNo">541</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> deleted = false;<a name="line.542"></a>
-<span class="sourceLineNo">543</span> } catch (IOException ioe) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.544"></a>
-<span class="sourceLineNo">545</span> "happening, use following exception when asking on mailing list.",<a name="line.545"></a>
-<span class="sourceLineNo">546</span> type, dir, ioe);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> deleted = false;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> return deleted;<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span><a name="line.552"></a>
-<span class="sourceLineNo">553</span> /**<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * Get cleaner results of subdirs.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * @param tasks subdirs cleaner tasks<a name="line.555"></a>
-<span class="sourceLineNo">556</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.556"></a>
-<span class="sourceLineNo">557</span> * @throws IOException something happen during computation<a name="line.557"></a>
-<span class="sourceLineNo">558</span> */<a name="line.558"></a>
-<span class="sourceLineNo">559</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> boolean cleaned = true;<a name="line.560"></a>
-<span class="sourceLineNo">561</span> try {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> for (CleanerTask task : tasks) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> cleaned &= task.get();<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> } catch (InterruptedException | ExecutionException e) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> throw new IOException(e);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span> return cleaned;<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>}<a name="line.571"></a>
+<span class="sourceLineNo">275</span> if (LOG.isTraceEnabled()) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> LOG.trace("Cleaned all WALs under {}", oldFileDir);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span> } else {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (LOG.isTraceEnabled()) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> LOG.trace("WALs outstanding under {}", oldFileDir);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> } finally {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> POOL.latchCountDown();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // After each cleaner chore, checks if received reconfigure notification while cleaning.<a name="line.286"></a>
+<span class="sourceLineNo">287</span> // First in cleaner turns off notification, to avoid another cleaner updating pool again.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (POOL.reconfigNotification.compareAndSet(true, false)) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // This cleaner is waiting for other cleaners finishing their jobs.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // To avoid missing next chore, only wait 0.8 * period, then shutdown.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> POOL.updatePool((long) (0.8 * getTimeUnit().toMillis(getPeriod())));<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> } else {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (LOG.isTraceEnabled()) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> LOG.trace("Cleaner chore disabled! Not cleaning.");<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> private void preRunCleaner() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> cleanersChain.forEach(FileCleanerDelegate::preClean);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span> public Boolean runCleaner() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> preRunCleaner();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> CleanerTask task = new CleanerTask(this.oldFileDir, true);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> POOL.submit(task);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return task.join();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * Sort the given list in (descending) order of the space each element takes<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @param dirs the list to sort, element in it should be directory (not file)<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> private void sortByConsumedSpace(List<FileStatus> dirs) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> if (dirs == null || dirs.size() < 2) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // no need to sort for empty or single directory<a name="line.317"></a>
+<span class="sourceLineNo">318</span> return;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> dirs.sort(new Comparator<FileStatus>() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> HashMap<FileStatus, Long> directorySpaces = new HashMap<>();<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> @Override<a name="line.323"></a>
+<span class="sourceLineNo">324</span> public int compare(FileStatus f1, FileStatus f2) {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> long f1ConsumedSpace = getSpace(f1);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long f2ConsumedSpace = getSpace(f2);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return Long.compare(f2ConsumedSpace, f1ConsumedSpace);<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> private long getSpace(FileStatus f) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Long cached = directorySpaces.get(f);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> if (cached != null) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> return cached;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> long space =<a name="line.336"></a>
+<span class="sourceLineNo">337</span> f.isDirectory() ? fs.getContentSummary(f.getPath()).getSpaceConsumed() : f.getLen();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> directorySpaces.put(f, space);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return space;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } catch (IOException e) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> LOG.trace("Failed to get space consumed by path={}", f, e);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> return -1;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span> });<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> /**<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * Run the given files through each of the cleaners to see if it should be deleted, deleting it if<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * necessary.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * @param files List of FileStatus for the files to check (and possibly delete)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * @return true iff successfully deleted all files<a name="line.352"></a>
+<span class="sourceLineNo">353</span> */<a name="line.353"></a>
+<span class="sourceLineNo">354</span> private boolean checkAndDeleteFiles(List<FileStatus> files) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> if (files == null) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return true;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> // first check to see if the path is valid<a name="line.359"></a>
+<span class="sourceLineNo">360</span> List<FileStatus> validFiles = Lists.newArrayListWithCapacity(files.size());<a name="line.360"></a>
+<span class="sourceLineNo">361</span> List<FileStatus> invalidFiles = Lists.newArrayList();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> for (FileStatus file : files) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (validate(file.getPath())) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> validFiles.add(file);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> } else {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> LOG.warn("Found a wrongly formatted file: " + file.getPath() + " - will delete it.");<a name="line.366"></a>
+<span class="sourceLineNo">367</span> invalidFiles.add(file);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> Iterable<FileStatus> deletableValidFiles = validFiles;<a name="line.371"></a>
+<span class="sourceLineNo">372</span> // check each of the cleaners for the valid files<a name="line.372"></a>
+<span class="sourceLineNo">373</span> for (T cleaner : cleanersChain) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> if (cleaner.isStopped() || this.getStopper().isStopped()) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> LOG.warn("A file cleaner" + this.getName() + " is stopped, won't delete any more files in:"<a name="line.375"></a>
+<span class="sourceLineNo">376</span> + this.oldFileDir);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> return false;<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> Iterable<FileStatus> filteredFiles = cleaner.getDeletableFiles(deletableValidFiles);<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> // trace which cleaner is holding on to each file<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (LOG.isTraceEnabled()) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> ImmutableSet<FileStatus> filteredFileSet = ImmutableSet.copyOf(filteredFiles);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (FileStatus file : deletableValidFiles) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (!filteredFileSet.contains(file)) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> LOG.trace(file.getPath() + " is not deletable according to:" + cleaner);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> deletableValidFiles = filteredFiles;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> Iterable<FileStatus> filesToDelete = Iterables.concat(invalidFiles, deletableValidFiles);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> return deleteFiles(filesToDelete) == files.size();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * Delete the given files<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * @param filesToDelete files to delete<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * @return number of deleted files<a name="line.402"></a>
+<span class="sourceLineNo">403</span> */<a name="line.403"></a>
+<span class="sourceLineNo">404</span> protected int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> int deletedFileCount = 0;<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for (FileStatus file : filesToDelete) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> Path filePath = file.getPath();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> LOG.trace("Removing {} from archive", filePath);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> try {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> boolean success = this.fs.delete(filePath, false);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (success) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> deletedFileCount++;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> } else {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> LOG.warn("Attempted to delete:" + filePath<a name="line.414"></a>
+<span class="sourceLineNo">415</span> + ", but couldn't. Run cleaner chain and attempt to delete on next pass.");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> } catch (IOException e) {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> e = e instanceof RemoteException ?<a name="line.418"></a>
+<span class="sourceLineNo">419</span> ((RemoteException)e).unwrapRemoteException() : e;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> LOG.warn("Error while deleting: " + filePath, e);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return deletedFileCount;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public synchronized void cleanup() {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> for (T lc : this.cleanersChain) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> try {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> lc.stop("Exiting");<a name="line.430"></a>
+<span class="sourceLineNo">431</span> } catch (Throwable t) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> LOG.warn("Stopping", t);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @VisibleForTesting<a name="line.437"></a>
+<span class="sourceLineNo">438</span> int getChorePoolSize() {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> return POOL.size;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * @param enabled<a name="line.443"></a>
+<span class="sourceLineNo">444</span> */<a name="line.444"></a>
+<span class="sourceLineNo">445</span> public boolean setEnabled(final boolean enabled) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> return this.enabled.getAndSet(enabled);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> public boolean getEnabled() { return this.enabled.get();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span> private interface Action<T> {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> T act() throws IOException;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> /**<a name="line.456"></a>
+<span class="sourceLineNo">457</span> * Attemps to clean up a directory, its subdirectories, and files.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Return value is true if everything was deleted. false on partial / total failures.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> */<a name="line.459"></a>
+<span class="sourceLineNo">460</span> private class CleanerTask extends RecursiveTask<Boolean> {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> private final Path dir;<a name="line.461"></a>
+<span class="sourceLineNo">462</span> private final boolean root;<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> CleanerTask(final FileStatus dir, final boolean root) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this(dir.getPath(), root);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> CleanerTask(final Path dir, final boolean root) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> this.dir = dir;<a name="line.469"></a>
+<span class="sourceLineNo">470</span> this.root = root;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> @Override<a name="line.473"></a>
+<span class="sourceLineNo">474</span> protected Boolean compute() {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> LOG.debug("Cleaning under {}", dir);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> List<FileStatus> subDirs;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> List<FileStatus> files;<a name="line.477"></a>
+<span class="sourceLineNo">478</span> try {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> // if dir doesn't exist, we'll get null back for both of these<a name="line.479"></a>
+<span class="sourceLineNo">480</span> // which will fall through to succeeding.<a name="line.480"></a>
+<span class="sourceLineNo">481</span> subDirs = getFilteredStatus(status -> status.isDirectory());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> files = getFilteredStatus(status -> status.isFile());<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } catch (IOException ioe) {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> LOG.warn("failed to get FileStatus for contents of '{}'", dir, ioe);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> return false;<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> boolean nullSubDirs = subDirs == null;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (nullSubDirs) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> LOG.trace("There is no subdir under {}", dir);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span> if (files == null) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> LOG.trace("There is no file under {}", dir);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> int capacity = nullSubDirs ? 0 : subDirs.size();<a name="line.496"></a>
+<span class="sourceLineNo">497</span> List<CleanerTask> tasks = Lists.newArrayListWithCapacity(capacity);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> if (!nullSubDirs) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> sortByConsumedSpace(subDirs);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> for (FileStatus subdir : subDirs) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> CleanerTask task = new CleanerTask(subdir, false);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> tasks.add(task);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> task.fork();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> boolean result = true;<a name="line.507"></a>
+<span class="sourceLineNo">508</span> result &= deleteAction(() -> checkAndDeleteFiles(files), "files");<a name="line.508"></a>
+<span class="sourceLineNo">509</span> result &= deleteAction(() -> getCleanResult(tasks), "subdirs");<a name="line.509"></a>
+<span class="sourceLineNo">510</span> // if and only if files and subdirs under current dir are deleted successfully, and<a name="line.510"></a>
+<span class="sourceLineNo">511</span> // it is not the root dir, then task will try to delete it.<a name="line.511"></a>
+<span class="sourceLineNo">512</span> if (result && !root) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> result &= deleteAction(() -> fs.delete(dir, false), "dir");<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span> return result;<a name="line.515"></a>
+<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span> /**<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * Get FileStatus with filter.<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * Pay attention that FSUtils #listStatusWithStatusFilter would return null,<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * even though status is empty but not null.<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * @param function a filter function<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * @return filtered FileStatus or null if dir doesn't exist<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @throws IOException if there's an error other than dir not existing<a name="line.524"></a>
+<span class="sourceLineNo">525</span> */<a name="line.525"></a>
+<span class="sourceLineNo">526</span> private List<FileStatus> getFilteredStatus(Predicate<FileStatus> function) throws IOException {<a name="line.526"></a>
+<span class="sourceLineNo">527</span> return FSUtils.listStatusWithStatusFilter(fs, dir, status -> function.test(status));<a name="line.527"></a>
+<span class="sourceLineNo">528</span> }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Perform a delete on a specified type.<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * @param deletion a delete<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * @param type possible values are 'files', 'subdirs', 'dirs'<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * @return true if it deleted successfully, false otherwise<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> private boolean deleteAction(Action<Boolean> deletion, String type) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> boolean deleted;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> try {<a name="line.538"></a>
+<span class="sourceLineNo">539</span> LOG.trace("Start deleting {} under {}", type, dir);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> deleted = deletion.act();<a name="line.540"></a>
+<span class="sourceLineNo">541</span> } catch (PathIsNotEmptyDirectoryException exception) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> // N.B. HDFS throws this exception when we try to delete a non-empty directory, but<a name="line.542"></a>
+<span class="sourceLineNo">543</span> // LocalFileSystem throws a bare IOException. So some test code will get the verbose<a name="line.543"></a>
+<span class="sourceLineNo">544</span> // message below.<a name="line.544"></a>
+<span class="sourceLineNo">545</span> LOG.debug("Couldn't delete '{}' yet because it isn't empty. Probably transient. " +<a name="line.545"></a>
+<span class="sourceLineNo">546</span> "exception details at TRACE.", dir);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> LOG.trace("Couldn't delete '{}' yet because it isn't empty w/exception.", dir, exception);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> deleted = false;<a name="line.548"></a>
+<span class="sourceLineNo">549</span> } catch (IOException ioe) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span> LOG.info("Could not delete {} under {}. might be transient; we'll retry. if it keeps " +<a name="line.550"></a>
+<span class="sourceLineNo">551</span> "happening, use following exception when asking on mailing list.",<a name="line.551"></a>
+<span class="sourceLineNo">552</span> type, dir, ioe);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> deleted = false;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> }<a name="line.554"></a>
+<span class="sourceLineNo">555</span> LOG.trace("Finish deleting {} under {}, deleted=", type, dir, deleted);<a name="line.555"></a>
+<span class="sourceLineNo">556</span> return deleted;<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
+<span class="sourceLineNo">560</span> * Get cleaner results of subdirs.<a name="line.560"></a>
+<span class="sourceLineNo">561</span> * @param tasks subdirs cleaner tasks<a name="line.561"></a>
+<span class="sourceLineNo">562</span> * @return true if all subdirs deleted successfully, false for patial/all failures<a name="line.562"></a>
+<span class="sourceLineNo">563</span> * @throws IOException something happen during computation<a name="line.563"></a>
+<span class="sourceLineNo">564</span> */<a name="line.564"></a>
+<span class="sourceLineNo">565</span> private boolean getCleanResult(List<CleanerTask> tasks) throws IOException {<a name="line.565"></a>
+<span class="sourceLineNo">566</span> boolean cleaned = true;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> try {<a name="line.567"></a>
+<span class="sourceLineNo">568</span> for (CleanerTask task : tasks) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span> cleaned &= task.get();<a name="line.569"></a>
+<span class="sourceLineNo">570</span> }<a name="line.570"></a>
+<span class="sourceLineNo">571</span> } catch (InterruptedException | ExecutionException e) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new IOException(e);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return cleaned;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>}<a name="line.577"></a>
[03/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
index c9fbc98..af2e5b1 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
@@ -116,811 +116,805 @@
<span class="sourceLineNo">108</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.108"></a>
<span class="sourceLineNo">109</span> throws IOException, InterruptedException {<a name="line.109"></a>
<span class="sourceLineNo">110</span> super(conf);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> conf.set(HConstants.MASTER_INFO_PORT, "0");<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> // Hadoop 2<a name="line.118"></a>
-<span class="sourceLineNo">119</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> this.initialClusterStatus = getClusterStatus();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> public Configuration getConfiguration() {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return this.conf;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * the FileSystem system exit hook does.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> */<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> private Thread shutdownThread = null;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> private User user = null;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.143"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> // Hadoop 2<a name="line.112"></a>
+<span class="sourceLineNo">113</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> this.initialClusterStatus = getClusterStatus();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> public Configuration getConfiguration() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> return this.conf;<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> /**<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * the FileSystem system exit hook does.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> private Thread shutdownThread = null;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> private User user = null;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> */<a name="line.136"></a>
+<span class="sourceLineNo">137</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throws IOException, InterruptedException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> super(conf);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> this.user = User.getCurrent();<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> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.145"></a>
-<span class="sourceLineNo">146</span> throws IOException, InterruptedException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> super(conf);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.user = User.getCurrent();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /*<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param c<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @param currentfs We return this if we did not make a new one.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @throws IOException<a name="line.156"></a>
-<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span> protected void handleReportForDutyResponse(<a name="line.160"></a>
-<span class="sourceLineNo">161</span> final RegionServerStartupResponse c) throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> super.handleReportForDutyResponse(c);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // Run this thread to shutdown our filesystem on way out.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<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> @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span> public void run() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public Object run() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> runRegionServer();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return null;<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> } catch (Throwable t) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> LOG.error("Exception in run", t);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> } finally {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Run this on the way out.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (this.shutdownThread != null) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.shutdownThread.start();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> private void runRegionServer() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> super.run();<a name="line.189"></a>
+<span class="sourceLineNo">145</span> /*<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @param c<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @param currentfs We return this if we did not make a new one.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @throws IOException<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
+<span class="sourceLineNo">154</span> protected void handleReportForDutyResponse(<a name="line.154"></a>
+<span class="sourceLineNo">155</span> final RegionServerStartupResponse c) throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> super.handleReportForDutyResponse(c);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> // Run this thread to shutdown our filesystem on way out.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public void run() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public Object run() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> runRegionServer();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return null;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> });<a name="line.170"></a>
+<span class="sourceLineNo">171</span> } catch (Throwable t) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.error("Exception in run", t);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> } finally {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Run this on the way out.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (this.shutdownThread != null) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> this.shutdownThread.start();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void runRegionServer() {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> super.run();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span> protected void kill() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> killedServers.add(getServerName());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> super.kill();<a name="line.189"></a>
<span class="sourceLineNo">190</span> }<a name="line.190"></a>
<span class="sourceLineNo">191</span><a name="line.191"></a>
<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> protected void kill() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> killedServers.add(getServerName());<a name="line.194"></a>
-<span class="sourceLineNo">195</span> super.kill();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public void abort(final String reason, final Throwable cause) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public Object run() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> abortRegionServer(reason, cause);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return null;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> });<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> super.abort(reason, cause);<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">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * Alternate shutdown hook.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> private final FileSystem fs;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> super("Shutdown of " + fs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.fs = fs;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public void run() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> try {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.fs.close();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> } catch (NullPointerException npe) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.230"></a>
-<span class="sourceLineNo">231</span> } catch (IOException e) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.warn("Running hook", e);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Class<? extends HMaster> masterClass,<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.239"></a>
-<span class="sourceLineNo">240</span> throws IOException, InterruptedException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (masterClass == null){<a name="line.242"></a>
-<span class="sourceLineNo">243</span> masterClass = HMaster.class;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (regionserverClass == null){<a name="line.245"></a>
-<span class="sourceLineNo">246</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> // start up a LocalHBaseCluster<a name="line.249"></a>
-<span class="sourceLineNo">250</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.250"></a>
-<span class="sourceLineNo">251</span> masterClass, regionserverClass);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> // manually add the regionservers as other users<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (rsPorts != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ".hfs."+index++);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> hbaseCluster.startup();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> shutdown();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> throw e;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> } catch (Throwable t) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> LOG.error("Error starting cluster", t);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> shutdown();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new IOException("Shutting down", t);<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>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> this.startRegionServer();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> LOG.info("Killing " + server.toString());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> @Override<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public boolean isKilledRS(ServerName serverName) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
+<span class="sourceLineNo">193</span> public void abort(final String reason, final Throwable cause) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public Object run() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> abortRegionServer(reason, cause);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return null;<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><a name="line.202"></a>
+<span class="sourceLineNo">203</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> super.abort(reason, cause);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Alternate shutdown hook.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> private final FileSystem fs;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> super("Shutdown of " + fs);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.fs = fs;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public void run() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.fs.close();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } catch (NullPointerException npe) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.224"></a>
+<span class="sourceLineNo">225</span> } catch (IOException e) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> LOG.warn("Running hook", e);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.231"></a>
+<span class="sourceLineNo">232</span> Class<? extends HMaster> masterClass,<a name="line.232"></a>
+<span class="sourceLineNo">233</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.233"></a>
+<span class="sourceLineNo">234</span> throws IOException, InterruptedException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (masterClass == null){<a name="line.236"></a>
+<span class="sourceLineNo">237</span> masterClass = HMaster.class;<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span> if (regionserverClass == null){<a name="line.239"></a>
+<span class="sourceLineNo">240</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // start up a LocalHBaseCluster<a name="line.243"></a>
+<span class="sourceLineNo">244</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.244"></a>
+<span class="sourceLineNo">245</span> masterClass, regionserverClass);<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> // manually add the regionservers as other users<a name="line.247"></a>
+<span class="sourceLineNo">248</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (rsPorts != null) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.253"></a>
+<span class="sourceLineNo">254</span> ".hfs."+index++);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> hbaseCluster.startup();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> } catch (IOException e) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> shutdown();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throw e;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } catch (Throwable t) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> LOG.error("Error starting cluster", t);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> shutdown();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException("Shutting down", t);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> this.startRegionServer();<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> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("Killing " + server.toString());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> } else {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public boolean isKilledRS(ServerName serverName) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> //ignore timeout for now<a name="line.297"></a>
+<span class="sourceLineNo">298</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
<span class="sourceLineNo">299</span> }<a name="line.299"></a>
<span class="sourceLineNo">300</span><a name="line.300"></a>
<span class="sourceLineNo">301</span> @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> //ignore timeout for now<a name="line.303"></a>
-<span class="sourceLineNo">304</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> @Override<a name="line.307"></a>
-<span class="sourceLineNo">308</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> @Override<a name="line.322"></a>
-<span class="sourceLineNo">323</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> @Override<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> @Override<a name="line.332"></a>
-<span class="sourceLineNo">333</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> @Override<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Override<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<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> @Override<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> @Override<a name="line.357"></a>
-<span class="sourceLineNo">358</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.startMaster();<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> @Override<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> abortMaster(getMasterIndex(serverName));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> @Override<a name="line.367"></a>
-<span class="sourceLineNo">368</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> stopMaster(getMasterIndex(serverName));<a name="line.369"></a>
+<span class="sourceLineNo">302</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span> @Override<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> @Override<a name="line.336"></a>
+<span class="sourceLineNo">337</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> @Override<a name="line.341"></a>
+<span class="sourceLineNo">342</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> @Override<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> this.startMaster();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Override<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> abortMaster(getMasterIndex(serverName));<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> @Override<a name="line.361"></a>
+<span class="sourceLineNo">362</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> stopMaster(getMasterIndex(serverName));<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> @Override<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> //ignore timeout for now<a name="line.368"></a>
+<span class="sourceLineNo">369</span> waitOnMaster(getMasterIndex(serverName));<a name="line.369"></a>
<span class="sourceLineNo">370</span> }<a name="line.370"></a>
<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> @Override<a name="line.372"></a>
-<span class="sourceLineNo">373</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> //ignore timeout for now<a name="line.374"></a>
-<span class="sourceLineNo">375</span> waitOnMaster(getMasterIndex(serverName));<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">378</span> /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * Starts a region server thread running<a name="line.379"></a>
-<span class="sourceLineNo">380</span> *<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @throws IOException<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return New RegionServerThread<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throws IOException {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> User rsUser =<a name="line.387"></a>
-<span class="sourceLineNo">388</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> try {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> t = hbaseCluster.addRegionServer(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> t.start();<a name="line.393"></a>
-<span class="sourceLineNo">394</span> t.waitForServerOnline();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } catch (InterruptedException ie) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return t;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * when it can't start a region server or when the region server is not processed by master<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * within the timeout.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return New RegionServerThread<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.408"></a>
-<span class="sourceLineNo">409</span> throws IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> long start = System.currentTimeMillis();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return t;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Threads.sleep(100);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (t.getRegionServer().isOnline()) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.423"></a>
-<span class="sourceLineNo">424</span> } else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param serverNumber Used as index into a list.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public String abortRegionServer(int serverNumber) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> LOG.info("Aborting " + server.toString());<a name="line.435"></a>
-<span class="sourceLineNo">436</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return server.toString();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Shut down the specified region server cleanly<a name="line.441"></a>
-<span class="sourceLineNo">442</span> *<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * @param serverNumber Used as index into a list.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * @return the region server that was stopped<a name="line.444"></a>
-<span class="sourceLineNo">445</span> */<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> return stopRegionServer(serverNumber, true);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Shut down the specified region server cleanly<a name="line.451"></a>
-<span class="sourceLineNo">452</span> *<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * @param serverNumber Used as index into a list.<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * you are running multiple regionservers in a test and you shut down one<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * before end of the test.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @return the region server that was stopped<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.460"></a>
-<span class="sourceLineNo">461</span> final boolean shutdownFS) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> JVMClusterUtil.RegionServerThread server =<a name="line.462"></a>
-<span class="sourceLineNo">463</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> LOG.info("Stopping " + server.toString());<a name="line.464"></a>
-<span class="sourceLineNo">465</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return server;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * of running threads.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param serverNumber<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @return Name of region server that just went down.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> */<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * Starts a master thread running<a name="line.481"></a>
-<span class="sourceLineNo">482</span> *<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @return New RegionServerThread<a name="line.483"></a>
-<span class="sourceLineNo">484</span> */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> User user =<a name="line.487"></a>
-<span class="sourceLineNo">488</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> JVMClusterUtil.MasterThread t = null;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> try {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> t.start();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> } catch (InterruptedException ie) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return t;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> /**<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * Returns the current active master, if available.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @return the active HMaster, null if none is active.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> */<a name="line.503"></a>
-<span class="sourceLineNo">504</span> @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> /**<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * Returns the current active master, if available.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @return the active HMaster, null if none is active.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> */<a name="line.512"></a>
-<span class="sourceLineNo">513</span> public HMaster getMaster() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return this.hbaseCluster.getActiveMaster();<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> /**<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Returns the current active master thread, if available.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * @return the active MasterThread, null if none is active.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> */<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public MasterThread getMasterThread() {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (mt.getMaster().isActiveMaster()) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> return mt;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns the master at the specified index, if available.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * @return the active HMaster, null if none is active.<a name="line.532"></a>
-<span class="sourceLineNo">533</span> */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public HMaster getMaster(final int serverNumber) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> return this.hbaseCluster.getMaster(serverNumber);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * Cause a master to exit without shutting down entire cluster.<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param serverNumber Used as index into a list.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> */<a name="line.541"></a>
-<span class="sourceLineNo">542</span> public String abortMaster(int serverNumber) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> HMaster server = getMaster(serverNumber);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Aborting " + server.toString());<a name="line.544"></a>
-<span class="sourceLineNo">545</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.545"></a>
-<span class="sourceLineNo">546</span> return server.toString();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Shut down the specified master cleanly<a name="line.550"></a>
-<span class="sourceLineNo">551</span> *<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * @param serverNumber Used as index into a list.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * @return the region server that was stopped<a name="line.553"></a>
-<span class="sourceLineNo">554</span> */<a name="line.554"></a>
-<span class="sourceLineNo">555</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> return stopMaster(serverNumber, true);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * Shut down the specified master cleanly<a name="line.560"></a>
-<span class="sourceLineNo">561</span> *<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * @param serverNumber Used as index into a list.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * master's shutdown. Usually we do but you do not want to do this if<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * you are running multiple master in a test and you shut down one<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * before end of the test.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @return the master that was stopped<a name="line.567"></a>
-<span class="sourceLineNo">568</span> */<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber,<a name="line.569"></a>
-<span class="sourceLineNo">570</span> final boolean shutdownFS) {<a name="line.570"></a>
-<span class="sourceLineNo">571</span> JVMClusterUtil.MasterThread server =<a name="line.571"></a>
-<span class="sourceLineNo">572</span> hbaseCluster.getMasters().get(serverNumber);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> LOG.info("Stopping " + server.toString());<a name="line.573"></a>
-<span class="sourceLineNo">574</span> server.getMaster().stop("Stopping master " + serverNumber);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> return server;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * Wait for the specified master to stop. Removes this thread from list<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * of running threads.<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * @param serverNumber<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * @return Name of master that just went down.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> */<a name="line.583"></a>
-<span class="sourceLineNo">584</span> public String waitOnMaster(final int serverNumber) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return this.hbaseCluster.waitOnMaster(serverNumber);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span> /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * Blocks until there is an active master and that master has completed<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * initialization.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> *<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @return true if an active master becomes available. false if there are no<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * masters left.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @throws InterruptedException<a name="line.594"></a>
-<span class="sourceLineNo">595</span> */<a name="line.595"></a>
-<span class="sourceLineNo">596</span> @Override<a name="line.596"></a>
-<span class="sourceLineNo">597</span> public boolean waitForActiveAndReadyMaster(long timeout) throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> List<JVMClusterUtil.MasterThread> mts;<a name="line.598"></a>
-<span class="sourceLineNo">599</span> long start = System.currentTimeMillis();<a name="line.599"></a>
-<span class="sourceLineNo">600</span> while (!(mts = getMasterThreads()).isEmpty()<a name="line.600"></a>
-<span class="sourceLineNo">601</span> && (System.currentTimeMillis() - start) < timeout) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (JVMClusterUtil.MasterThread mt : mts) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (mt.getMaster().isActiveMaster() && mt.getMaster().isInitialized()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return true;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span> Threads.sleep(100);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> }<a name="line.609"></a>
-<span class="sourceLineNo">610</span> return false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * @return List of master threads.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> */<a name="line.615"></a>
-<span class="sourceLineNo">616</span> public List<JVMClusterUtil.MasterThread> getMasterThreads() {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> return this.hbaseCluster.getMasters();<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * @return List of live master threads (skips the aborted and the killed)<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> public List<JVMClusterUtil.MasterThread> getLiveMasterThreads() {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return this.hbaseCluster.getLiveMasters();<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> /**<a name="line.627"></a>
-<span class="sourceLineNo">628</span> * Wait for Mini HBase Cluster to shut down.<a name="line.628"></a>
-<span class="sourceLineNo">629</span> */<a name="line.629"></a>
-<span class="sourceLineNo">630</span> public void join() {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> this.hbaseCluster.join();<a name="line.631"></a>
-<span class="sourceLineNo">632</span> }<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span> /**<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * Shut down the mini HBase cluster<a name="line.635"></a>
-<span class="sourceLineNo">636</span> */<a name="line.636"></a>
-<span class="sourceLineNo">637</span> @Override<a name="line.637"></a>
-<span class="sourceLineNo">638</span> public void shutdown() throws IOException {<a name="line.638"></a>
-<span class="sourceLineNo">639</span> if (this.hbaseCluster != null) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span> this.hbaseCluster.shutdown();<a name="line.640"></a>
-<span class="sourceLineNo">641</span> }<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> @Override<a name="line.644"></a>
-<span class="sourceLineNo">645</span> public void close() throws IOException {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> /**<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0<a name="line.649"></a>
-<span class="sourceLineNo">650</span> * Use {@link #getClusterMetrics()} instead.<a name="line.650"></a>
-<span class="sourceLineNo">651</span> */<a name="line.651"></a>
-<span class="sourceLineNo">652</span> @Deprecated<a name="line.652"></a>
-<span class="sourceLineNo">653</span> public ClusterStatus getClusterStatus() throws IOException {<a name="line.653"></a>
+<span class="sourceLineNo">372</span> /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * Starts a region server thread running<a name="line.373"></a>
+<span class="sourceLineNo">374</span> *<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * @throws IOException<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * @return New RegionServerThread<a name="line.376"></a>
+<span class="sourceLineNo">377</span> */<a name="line.377"></a>
+<span class="sourceLineNo">378</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.378"></a>
+<span class="sourceLineNo">379</span> throws IOException {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> User rsUser =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> try {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> t = hbaseCluster.addRegionServer(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> t.start();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> t.waitForServerOnline();<a name="line.388"></a>
+<span class="sourceLineNo">389</span> } catch (InterruptedException ie) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span> return t;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.396"></a>
+<span class="sourceLineNo">397</span> * when it can't start a region server or when the region server is not processed by master<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * within the timeout.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> *<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * @return New RegionServerThread<a name="line.400"></a>
+<span class="sourceLineNo">401</span> */<a name="line.401"></a>
+<span class="sourceLineNo">402</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throws IOException {<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> long start = System.currentTimeMillis();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return t;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span> Threads.sleep(100);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (t.getRegionServer().isOnline()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @param serverNumber Used as index into a list.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public String abortRegionServer(int serverNumber) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> LOG.info("Aborting " + server.toString());<a name="line.429"></a>
+<span class="sourceLineNo">430</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return server.toString();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Shut down the specified region server cleanly<a name="line.435"></a>
+<span class="sourceLineNo">436</span> *<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * @param serverNumber Used as index into a list.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * @return the region server that was stopped<a name="line.438"></a>
+<span class="sourceLineNo">439</span> */<a name="line.439"></a>
+<span class="sourceLineNo">440</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> return stopRegionServer(serverNumber, true);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> /**<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Shut down the specified region server cleanly<a name="line.445"></a>
+<span class="sourceLineNo">446</span> *<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * @param serverNumber Used as index into a list.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * you are running multiple regionservers in a test and you shut down one<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * before end of the test.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * @return the region server that was stopped<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.454"></a>
+<span class="sourceLineNo">455</span> final boolean shutdownFS) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> JVMClusterUtil.RegionServerThread server =<a name="line.456"></a>
+<span class="sourceLineNo">457</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> LOG.info("Stopping " + server.toString());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return server;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> /**<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * of running threads.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * @param serverNumber<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * @return Name of region server that just went down.<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * Starts a master thread running<a name="line.475"></a>
+<span class="sourceLineNo">476</span> *<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @return New RegionServerThread<a name="line.477"></a>
+<span class="sourceLineNo">478</span> */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> User user =<a name="line.481"></a>
+<span class="sourceLineNo">482</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span> JVMClusterUtil.MasterThread t = null;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> try {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> t.start();<a name="line.487"></a>
+<span class="sourceLineNo">488</span> } catch (InterruptedException ie) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return t;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * Returns the current active master, if available.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * @return the active HMaster, null if none is active.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> @Override<a name="line.498"></a>
+<span class="sourceLineNo">499</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> /**<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Returns the current active master, if available.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> * @return the active HMaster, null if none is active.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> */<a name="line.506"></a>
+<span class="sourceLineNo">507</span> public HMaster getMaster() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return this.hbaseCluster.getActiveMaster();<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Returns the current active master thread, if available.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> * @return the active MasterThread, null if none is active.<a name="line.513"></a>
+<span class="sourceLineNo">514</span> */<a name="line.514"></a>
+<span class="sourceLineNo">515</span> public MasterThread getMasterThread() {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> if (mt.getMaster().isActiveMaster()) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return mt;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> return null;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * Returns the master at the
<TRUNCATED>
[10/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html b/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html
new file mode 100644
index 0000000..a9e5cb5
--- /dev/null
+++ b/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html
@@ -0,0 +1,376 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TestHBaseTestingUtilSpinup (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="TestHBaseTestingUtilSpinup (Apache HBase 3.0.0-SNAPSHOT Test API)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":9,"i1":9,"i2":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestHBaseTestingUtilSpinup.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" target="_top">Frames</a></li>
+<li><a href="TestHBaseTestingUtilSpinup.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.hadoop.hbase</div>
+<h2 title="Class TestHBaseTestingUtilSpinup" class="title">Class TestHBaseTestingUtilSpinup</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.39">TestHBaseTestingUtilSpinup</a>
+extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<div class="block">Make sure we can spin up a HBTU without a hbase-site.xml</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#LOG">LOG</a></span></code> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#UTIL">UTIL</a></span></code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#TestHBaseTestingUtilSpinup--">TestHBaseTestingUtilSpinup</a></span>()</code> </td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#afterClass--">afterClass</a></span>()</code> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#beforeClass--">beforeClass</a></span>()</code> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#testGetMetaTableRows--">testGetMetaTableRows</a></span>()</code> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="https://docs.oracle.com/javase/8/docs/api/ja
va/lang/Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a name="CLASS_RULE">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CLASS_RULE</h4>
+<pre>public static final <a href="../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.42">CLASS_RULE</a></pre>
+</li>
+</ul>
+<a name="LOG">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final org.slf4j.Logger <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.45">LOG</a></pre>
+</li>
+</ul>
+<a name="UTIL">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UTIL</h4>
+<pre>private static final <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.46">UTIL</a></pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TestHBaseTestingUtilSpinup--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TestHBaseTestingUtilSpinup</h4>
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.39">TestHBaseTestingUtilSpinup</a>()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="beforeClass--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>beforeClass</h4>
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.49">beforeClass</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="afterClass--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>afterClass</h4>
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.57">afterClass</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testGetMetaTableRows--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testGetMetaTableRows</h4>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#line.62">testGetMetaTableRows</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TestHBaseTestingUtilSpinup.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" target="_top">Frames</a></li>
+<li><a href="TestHBaseTestingUtilSpinup.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2007–2018 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtility.html b/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
index 3538d40..da74c1c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/TestHBaseTestingUtility.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/hadoop/hbase/TestHBaseTestingUtility.html" target="_top">Frames</a></li>
@@ -485,7 +485,12 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>testOverridingOfDefaultPorts</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html#line.439">testOverridingOfDefaultPorts</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/TestHBaseTestingUtility.html#line.439">testOverridingOfDefaultPorts</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
</li>
</ul>
</li>
@@ -517,7 +522,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/hadoop/hbase/TestHBaseTestingUtility.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/TestHColumnDescriptor.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/TestHColumnDescriptor.html b/testdevapidocs/org/apache/hadoop/hbase/TestHColumnDescriptor.html
index 2b39023..cc770d9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/TestHColumnDescriptor.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/TestHColumnDescriptor.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -394,7 +394,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
index d865969..7d35278 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
@@ -720,6 +720,10 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TestHBaseTestingUtilSpinup.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
<td class="colLast"><span class="typeNameLabel">TestIntegrationTestBase.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/TestIntegrationTestBase.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
index bcd3437..1db86f0 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseTestingUtility.html
@@ -479,6 +479,10 @@
<td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
<td class="colLast"><span class="typeNameLabel">TestRegionRebalancing.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/TestRegionRebalancing.html#UTIL">UTIL</a></span></code> </td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TestHBaseTestingUtilSpinup.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html#UTIL">UTIL</a></span></code> </td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/class-use/TestHBaseTestingUtilSpinup.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/class-use/TestHBaseTestingUtilSpinup.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/TestHBaseTestingUtilSpinup.html
new file mode 100644
index 0000000..df18eb1
--- /dev/null
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/TestHBaseTestingUtilSpinup.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Uses of Class org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup (Apache HBase 3.0.0-SNAPSHOT Test API)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/hadoop/hbase/class-use/TestHBaseTestingUtilSpinup.html" target="_top">Frames</a></li>
+<li><a href="TestHBaseTestingUtilSpinup.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup" class="title">Uses of Class<br>org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup</h2>
+</div>
+<div class="classUseContainer">No usage of org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/apache/hadoop/hbase/class-use/TestHBaseTestingUtilSpinup.html" target="_top">Frames</a></li>
+<li><a href="TestHBaseTestingUtilSpinup.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright © 2007–2018 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
index 50f9d0f..237bd23 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.45">TestFileIOEngine</a>
+<pre>public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.46">TestFileIOEngine</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Basic test for <code>FileIOEngine</code></div>
</li>
@@ -212,7 +212,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</tr>
<tr id="i5" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#testRefreshFileConnectionClosesConnections--">testRefreshFileConnectionClosesConnections</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#testRefreshFileConnection--">testRefreshFileConnection</a></span>()</code> </td>
</tr>
</table>
<ul class="blockList">
@@ -242,7 +242,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>CLASS_RULE</h4>
-<pre>public static final <a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.48">CLASS_RULE</a></pre>
+<pre>public static final <a href="../../../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.49">CLASS_RULE</a></pre>
</li>
</ul>
<a name="TOTAL_CAPACITY">
@@ -251,7 +251,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>TOTAL_CAPACITY</h4>
-<pre>private static final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.51">TOTAL_CAPACITY</a></pre>
+<pre>private static final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.52">TOTAL_CAPACITY</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.bucket.TestFileIOEngine.TOTAL_CAPACITY">Constant Field Values</a></dd>
@@ -264,7 +264,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>FILE_PATHS</h4>
-<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.52">FILE_PATHS</a></pre>
+<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.53">FILE_PATHS</a></pre>
</li>
</ul>
<a name="SIZE_PER_FILE">
@@ -273,7 +273,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>SIZE_PER_FILE</h4>
-<pre>private static final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.54">SIZE_PER_FILE</a></pre>
+<pre>private static final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.55">SIZE_PER_FILE</a></pre>
</li>
</ul>
<a name="boundaryStartPositions">
@@ -282,7 +282,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>boundaryStartPositions</h4>
-<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.55">boundaryStartPositions</a></pre>
+<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.56">boundaryStartPositions</a></pre>
</li>
</ul>
<a name="boundaryStopPositions">
@@ -291,7 +291,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>boundaryStopPositions</h4>
-<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.56">boundaryStopPositions</a></pre>
+<pre>private static final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.57">boundaryStopPositions</a></pre>
</li>
</ul>
<a name="fileIOEngine">
@@ -300,7 +300,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>fileIOEngine</h4>
-<pre>private org.apache.hadoop.hbase.io.hfile.bucket.FileIOEngine <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.58">fileIOEngine</a></pre>
+<pre>private org.apache.hadoop.hbase.io.hfile.bucket.FileIOEngine <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.59">fileIOEngine</a></pre>
</li>
</ul>
</li>
@@ -317,7 +317,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>TestFileIOEngine</h4>
-<pre>public <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.45">TestFileIOEngine</a>()</pre>
+<pre>public <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.46">TestFileIOEngine</a>()</pre>
</li>
</ul>
</li>
@@ -334,7 +334,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setUp</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.76">setUp</a>()
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.77">setUp</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -348,7 +348,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>cleanUp</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.81">cleanUp</a>()</pre>
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.82">cleanUp</a>()</pre>
</li>
</ul>
<a name="testFileIOEngine--">
@@ -357,7 +357,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testFileIOEngine</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.92">testFileIOEngine</a>()
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.93">testFileIOEngine</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -371,7 +371,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testFileIOEngineHandlesZeroLengthInput</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.119">testFileIOEngineHandlesZeroLengthInput</a>()
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.120">testFileIOEngineHandlesZeroLengthInput</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -385,7 +385,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testClosedChannelException</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.130">testClosedChannelException</a>()
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.131">testClosedChannelException</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -393,14 +393,14 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</dl>
</li>
</ul>
-<a name="testRefreshFileConnectionClosesConnections--">
+<a name="testRefreshFileConnection--">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>testRefreshFileConnectionClosesConnections</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.146">testRefreshFileConnectionClosesConnections</a>()
- throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<h4>testRefreshFileConnection</h4>
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.html#line.147">testRefreshFileConnection</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/package-frame.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-frame.html b/testdevapidocs/org/apache/hadoop/hbase/package-frame.html
index 8324a04..c15d3da 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-frame.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-frame.html
@@ -193,6 +193,7 @@
<li><a href="TestHBaseConfiguration.ReflectiveCredentialProviderClient.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHBaseConfiguration.ReflectiveCredentialProviderClient</a></li>
<li><a href="TestHBaseOnOtherDfsCluster.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHBaseOnOtherDfsCluster</a></li>
<li><a href="TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHBaseTestingUtility</a></li>
+<li><a href="TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHBaseTestingUtilSpinup</a></li>
<li><a href="TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHColumnDescriptor</a></li>
<li><a href="TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHColumnDescriptorDefaultVersions</a></li>
<li><a href="TestHDFSBlocksDistribution.html" title="class in org.apache.hadoop.hbase" target="classFrame">TestHDFSBlocksDistribution</a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/package-summary.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-summary.html b/testdevapidocs/org/apache/hadoop/hbase/package-summary.html
index 9a6db99..a06d889 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-summary.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-summary.html
@@ -1019,292 +1019,298 @@
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase">TestHBaseTestingUtilSpinup</a></td>
+<td class="colLast">
+<div class="block">Make sure we can spin up a HBTU without a hbase-site.xml</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase">TestHColumnDescriptor</a></td>
<td class="colLast">Deprecated</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase">TestHColumnDescriptorDefaultVersions</a></td>
<td class="colLast">
<div class="block">Verify that the HColumnDescriptor version is set correctly by default, hbase-site.xml, and user
input</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestHDFSBlocksDistribution.html" title="class in org.apache.hadoop.hbase">TestHDFSBlocksDistribution</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestHRegionLocation.html" title="class in org.apache.hadoop.hbase">TestHRegionLocation</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestHTableDescriptor.html" title="class in org.apache.hadoop.hbase">TestHTableDescriptor</a></td>
<td class="colLast">Deprecated</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIndividualBytesFieldCell.html" title="class in org.apache.hadoop.hbase">TestIndividualBytesFieldCell</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestInfoServers.html" title="class in org.apache.hadoop.hbase">TestInfoServers</a></td>
<td class="colLast">
<div class="block">Testing, info servers are disabled.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIntegrationTestBase.html" title="class in org.apache.hadoop.hbase">TestIntegrationTestBase</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIOFencing.html" title="class in org.apache.hadoop.hbase">TestIOFencing</a></td>
<td class="colLast">
<div class="block">Test for the case where a regionserver going down has enough cycles to do damage to regions that
have actually been assigned elsehwere.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIOFencing.BlockCompactionsInCompletionHStore.html" title="class in org.apache.hadoop.hbase">TestIOFencing.BlockCompactionsInCompletionHStore</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIOFencing.BlockCompactionsInCompletionRegion.html" title="class in org.apache.hadoop.hbase">TestIOFencing.BlockCompactionsInCompletionRegion</a></td>
<td class="colLast">
<div class="block">An override of HRegion that allows us park compactions in a holding pattern and
then when appropriate for the test, allow them proceed again.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIOFencing.BlockCompactionsInPrepRegion.html" title="class in org.apache.hadoop.hbase">TestIOFencing.BlockCompactionsInPrepRegion</a></td>
<td class="colLast">
<div class="block">An override of HRegion that allows us park compactions in a holding pattern and
then when appropriate for the test, allow them proceed again.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIOFencing.CompactionBlockerRegion.html" title="class in org.apache.hadoop.hbase">TestIOFencing.CompactionBlockerRegion</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.html" title="class in org.apache.hadoop.hbase">TestIPv6NIOServerSocketChannel</a></td>
<td class="colLast">
<div class="block">This tests whether ServerSocketChannel works over ipv6, which ZooKeeper
depends on.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestJMXConnectorServer.html" title="class in org.apache.hadoop.hbase">TestJMXConnectorServer</a></td>
<td class="colLast">
<div class="block">Test case for JMX Connector Server.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestJMXConnectorServer.MyAccessController.html" title="class in org.apache.hadoop.hbase">TestJMXConnectorServer.MyAccessController</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestJMXListener.html" title="class in org.apache.hadoop.hbase">TestJMXListener</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestKeyValue.html" title="class in org.apache.hadoop.hbase">TestKeyValue</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestKeyValue.MockKeyValue.html" title="class in org.apache.hadoop.hbase">TestKeyValue.MockKeyValue</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestLocalHBaseCluster.html" title="class in org.apache.hadoop.hbase">TestLocalHBaseCluster</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestLocalHBaseCluster.MyHMaster.html" title="class in org.apache.hadoop.hbase">TestLocalHBaseCluster.MyHMaster</a></td>
<td class="colLast">
<div class="block">A private master class similar to that used by HMasterCommandLine when
running in local mode.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestLocalHBaseCluster.MyHRegionServer.html" title="class in org.apache.hadoop.hbase">TestLocalHBaseCluster.MyHRegionServer</a></td>
<td class="colLast">
<div class="block">A private regionserver class with a dummy method for testing casts</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMetaTableAccessor.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessor</a></td>
<td class="colLast">
<div class="block">Test <code>MetaTableAccessor</code>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMetaTableAccessor.MetaTask.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessor.MetaTask</a></td>
<td class="colLast">
<div class="block">Thread that runs a MetaTableAccessor task until asked stop.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMetaTableAccessor.SpyingRpcScheduler.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessor.SpyingRpcScheduler</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMetaTableAccessor.SpyingRpcSchedulerFactory.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessor.SpyingRpcSchedulerFactory</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.html" title="class in org.apache.hadoop.hbase">TestMetaTableAccessorNoCluster</a></td>
<td class="colLast">
<div class="block">Test MetaTableAccessor but without spinning up a cluster.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMetaTableLocator.html" title="class in org.apache.hadoop.hbase">TestMetaTableLocator</a></td>
<td class="colLast">
<div class="block">Test <code>MetaTableLocator</code></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMovedRegionsCleaner.html" title="class in org.apache.hadoop.hbase">TestMovedRegionsCleaner</a></td>
<td class="colLast">
<div class="block">Test whether background cleanup of MovedRegion entries is happening</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMovedRegionsCleaner.TestMockRegionServer.html" title="class in org.apache.hadoop.hbase">TestMovedRegionsCleaner.TestMockRegionServer</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestMultiVersions.html" title="class in org.apache.hadoop.hbase">TestMultiVersions</a></td>
<td class="colLast">
<div class="block">Port of old TestScanMultipleVersions, TestTimestamp and TestGetRowVersions
from old testing framework to <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><code>HBaseTestingUtility</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestNamespace.html" title="class in org.apache.hadoop.hbase">TestNamespace</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestNodeHealthCheckChore.html" title="class in org.apache.hadoop.hbase">TestNodeHealthCheckChore</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestNodeHealthCheckChore.StoppableImplementation.html" title="class in org.apache.hadoop.hbase">TestNodeHealthCheckChore.StoppableImplementation</a></td>
<td class="colLast">
<div class="block">Simple helper class that just keeps track of whether or not its stopped.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestPartialResultsFromClientSide.html" title="class in org.apache.hadoop.hbase">TestPartialResultsFromClientSide</a></td>
<td class="colLast">
<div class="block">These tests are focused on testing how partial results appear to a client.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestPerformanceEvaluation.html" title="class in org.apache.hadoop.hbase">TestPerformanceEvaluation</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestRegionLoad.html" title="class in org.apache.hadoop.hbase">TestRegionLoad</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestRegionLocations.html" title="class in org.apache.hadoop.hbase">TestRegionLocations</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestRegionMetrics.html" title="class in org.apache.hadoop.hbase">TestRegionMetrics</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestRegionRebalancing.html" title="class in org.apache.hadoop.hbase">TestRegionRebalancing</a></td>
<td class="colLast">
<div class="block">Test whether region re-balancing works.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.html" title="class in org.apache.hadoop.hbase">TestSequenceIdMonotonicallyIncreasing</a></td>
<td class="colLast">
<div class="block">Testcase for HBASE-20066</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestSerialization.html" title="class in org.apache.hadoop.hbase">TestSerialization</a></td>
<td class="colLast">
<div class="block">Test HBase Writables serializations</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestServerLoad.html" title="class in org.apache.hadoop.hbase">TestServerLoad</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestServerMetrics.html" title="class in org.apache.hadoop.hbase">TestServerMetrics</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestServerName.html" title="class in org.apache.hadoop.hbase">TestServerName</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.html" title="class in org.apache.hadoop.hbase">TestServerSideScanMetricsFromClientSide</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestSize.html" title="class in org.apache.hadoop.hbase">TestSize</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestSplitMerge.html" title="class in org.apache.hadoop.hbase">TestSplitMerge</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestStochasticBalancerJmxMetrics.html" title="class in org.apache.hadoop.hbase">TestStochasticBalancerJmxMetrics</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestTableName.html" title="class in org.apache.hadoop.hbase">TestTableName</a></td>
<td class="colLast">
<div class="block">Returns a <code>byte[]</code> containing the name of the currently running test method.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestTableName.Names.html" title="class in org.apache.hadoop.hbase">TestTableName.Names</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestTagRewriteCell.html" title="class in org.apache.hadoop.hbase">TestTagRewriteCell</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestTagUtil.html" title="class in org.apache.hadoop.hbase">TestTagUtil</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestTimeout.html" title="class in org.apache.hadoop.hbase">TestTimeout</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestZooKeeper.html" title="class in org.apache.hadoop.hbase">TestZooKeeper</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TestZooKeeper.MockLoadBalancer.html" title="class in org.apache.hadoop.hbase">TestZooKeeper.MockLoadBalancer</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TimedOutTestsListener.html" title="class in org.apache.hadoop.hbase">TimedOutTestsListener</a></td>
<td class="colLast">
<div class="block">JUnit run listener which prints full thread dump into System.err
in case a test is failed due to timeout.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/TimestampTestBase.html" title="class in org.apache.hadoop.hbase">TimestampTestBase</a></td>
<td class="colLast">
<div class="block">Tests user specifiable time stamps putting, getting and scanning.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/hadoop/hbase/Waiter.html" title="class in org.apache.hadoop.hbase">Waiter</a></td>
<td class="colLast">
<div class="block">A class that provides a standard waitFor pattern
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index e3523ba..419902a 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -471,6 +471,7 @@
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHBaseConfiguration.ReflectiveCredentialProviderClient.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseConfiguration.ReflectiveCredentialProviderClient</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseOnOtherDfsCluster</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseTestingUtility</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseTestingUtilSpinup</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHColumnDescriptor</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHColumnDescriptorDefaultVersions</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/TestHDFSBlocksDistribution.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHDFSBlocksDistribution</span></a></li>
@@ -569,11 +570,11 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
index 28973e0..a1c9b1d 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
@@ -81,14 +81,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure<TEnvironment> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)
+<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a><V>, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
</ul>
</li>
-<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a><V>, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
+<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure<TEnvironment> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
</ul>
</li>
<li type="circle">org.apache.hadoop.hbase.procedure.ProcedureManager
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index ca2f47e..b5bacb6 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -205,9 +205,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 47fa886..98638d3 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -655,11 +655,11 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html b/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
index b3ee5ab..150ba54 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html
@@ -135,14 +135,10 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#CLASS_RULE">CLASS_RULE</a></span></code> </td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code>private static org.apache.hadoop.conf.Configuration</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#conf">conf</a></span></code> </td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><code>protected static org.slf4j.Logger</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#LOG">LOG</a></span></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private static <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#TEST_UTIL">TEST_UTIL</a></span></code> </td>
</tr>
@@ -233,21 +229,12 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<a name="TEST_UTIL">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>TEST_UTIL</h4>
<pre>private static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#line.51">TEST_UTIL</a></pre>
</li>
</ul>
-<a name="conf">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>conf</h4>
-<pre>private static org.apache.hadoop.conf.Configuration <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#line.52">conf</a></pre>
-</li>
-</ul>
</li>
</ul>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -279,7 +266,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setUp</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#line.55">setUp</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/TestEnableRSGroup.html#line.54">setUp</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 932a188..1a628fe 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 532d67b..4edd3f8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -139,9 +139,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
</ul>
</li>
</ul>
[09/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/overview-tree.html b/testdevapidocs/overview-tree.html
index a7e9eab..1d990ee 100644
--- a/testdevapidocs/overview-tree.html
+++ b/testdevapidocs/overview-tree.html
@@ -2689,6 +2689,7 @@
<li type="circle">org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/TestHBaseRpcControllerImpl.html" title="class in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">TestHBaseRpcControllerImpl</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.html" title="class in org.apache.hadoop.hbase.security"><span class="typeNameLink">TestHBaseSaslRpcClient</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtility.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseTestingUtility</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHBaseTestingUtilSpinup</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHColumnDescriptor.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHColumnDescriptor</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHColumnDescriptorDefaultVersions</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/TestHDFSBlocksDistribution.html" title="class in org.apache.hadoop.hbase"><span class="typeNameLink">TestHDFSBlocksDistribution</span></a></li>
[28/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
index 3647d12..25faf76 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
@@ -34,292 +34,308 @@
<span class="sourceLineNo">026</span>import java.nio.channels.ClosedChannelException;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import java.nio.channels.FileChannel;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import java.util.Arrays;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.util.StringUtils;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * IO engine that stores data to a file on the local file system.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@InterfaceAudience.Private<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public class FileIOEngine implements IOEngine {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public static final String FILE_DELIMITER = ",";<a name="line.48"></a>
-<span class="sourceLineNo">049</span> private final String[] filePaths;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private final FileChannel[] fileChannels;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> private final RandomAccessFile[] rafs;<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private final long sizePerFile;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final long capacity;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.59"></a>
-<span class="sourceLineNo">060</span> throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> this.sizePerFile = capacity / filePaths.length;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> this.filePaths = filePaths;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (!maintainPersistence) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> for (String filePath : filePaths) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> File file = new File(filePath);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> if (file.exists()) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (LOG.isDebugEnabled()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> file.delete();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> // If deletion fails still we can manage with the writes<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> String filePath = filePaths[i];<a name="line.79"></a>
-<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.81"></a>
-<span class="sourceLineNo">082</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (totalSpace < sizePerFile) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // The next setting length will throw exception,logging this message<a name="line.84"></a>
-<span class="sourceLineNo">085</span> // is just used for the detail reason of exception，<a name="line.85"></a>
-<span class="sourceLineNo">086</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.86"></a>
-<span class="sourceLineNo">087</span> + " total space under " + filePath + ", not enough for requested "<a name="line.87"></a>
-<span class="sourceLineNo">088</span> + StringUtils.byteDesc(sizePerFile);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> LOG.warn(msg);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> rafs[i].setLength(sizePerFile);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> fileChannels[i] = rafs[i].getChannel();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.93"></a>
-<span class="sourceLineNo">094</span> + ", on the path:" + filePath);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> } catch (IOException fex) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> shutdown();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> throw fex;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public String toString() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.105"></a>
-<span class="sourceLineNo">106</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * File IO engine is always able to support persistent storage for the cache<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @return true<a name="line.111"></a>
-<span class="sourceLineNo">112</span> */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public boolean isPersistent() {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Transfers data from file to the given byte buffer<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param offset The offset in the file where the first byte to be read<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param length The length of buffer that should be allocated for reading<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * from the file channel<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @return number of bytes read<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @throws IOException<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (length != 0) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // the results are not corrupted before consuming them.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (dstBuffer.limit() != length) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.138"></a>
-<span class="sourceLineNo">139</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<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> @VisibleForTesting<a name="line.145"></a>
-<span class="sourceLineNo">146</span> void closeFileChannels() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> for (FileChannel fileChannel: fileChannels) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> fileChannel.close();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } catch (IOException e) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.warn("Failed to close FileChannel", e);<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> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * Transfers data from the given byte buffer to file<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * @param offset The offset in the file where the first byte to be written<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @throws IOException<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (!srcBuffer.hasRemaining()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> accessFile(writeAccessor, srcBuffer, offset);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Sync the data to file after writing<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @throws IOException<a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public void sync() throws IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (fileChannels[i] != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> fileChannels[i].force(true);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> } catch (IOException ie) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> throw ie;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Close the file<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void shutdown() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (fileChannels[i] != null) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> fileChannels[i].close();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (rafs[i] != null) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rafs[i].close();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } catch (IOException ex) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> assert srcBuffer.hasArray();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.211"></a>
-<span class="sourceLineNo">212</span> srcBuffer.remaining()), offset);<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">215</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.215"></a>
-<span class="sourceLineNo">216</span> long globalOffset) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> int startFileNum = getFileNum(globalOffset);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> int remainingAccessDataLen = buffer.remaining();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> int accessFileNum = startFileNum;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> int bufLimit = buffer.limit();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> while (true) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.224"></a>
-<span class="sourceLineNo">225</span> int accessLen = 0;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (endFileNum > accessFileNum) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // short the limit;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.228"></a>
-<span class="sourceLineNo">229</span> + sizePerFile - accessOffset));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span> try {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (ClosedByInterruptException e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> throw e;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> } catch (ClosedChannelException e) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file. ", e);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> refreshFileConnection(accessFileNum);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> continue;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // recover the limit<a name="line.240"></a>
-<span class="sourceLineNo">241</span> buffer.limit(bufLimit);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (accessLen < remainingAccessDataLen) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> remainingAccessDataLen -= accessLen;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> accessFileNum++;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> accessOffset = 0;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> break;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (accessFileNum >= fileChannels.length) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.250"></a>
-<span class="sourceLineNo">251</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.251"></a>
-<span class="sourceLineNo">252</span> + globalOffset);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Get the absolute offset in given file with the relative global offset.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * @param fileNum<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * @param globalOffset<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @return the absolute offset<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return globalOffset - fileNum * sizePerFile;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> private int getFileNum(long offset) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (offset < 0) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> int fileNum = (int) (offset / sizePerFile);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (fileNum >= fileChannels.length) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new RuntimeException("Not expected offset " + offset<a name="line.273"></a>
-<span class="sourceLineNo">274</span> + " where capacity=" + capacity);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> return fileNum;<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @VisibleForTesting<a name="line.279"></a>
-<span class="sourceLineNo">280</span> FileChannel[] getFileChannels() {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return fileChannels;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> @VisibleForTesting<a name="line.284"></a>
-<span class="sourceLineNo">285</span> void refreshFileConnection(int accessFileNum) throws IOException {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (fileChannel != null) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> fileChannel.close();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private static interface FileAccessor {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.295"></a>
-<span class="sourceLineNo">296</span> throws IOException;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> private static class FileReadAccessor implements FileAccessor {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.301"></a>
-<span class="sourceLineNo">302</span> long accessOffset) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
-<span class="sourceLineNo">309</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> long accessOffset) throws IOException {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> return fileChannel.write(byteBuffer, accessOffset);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">029</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.util.StringUtils;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * IO engine that stores data to a file on the local file system.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public class FileIOEngine implements IOEngine {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public static final String FILE_DELIMITER = ",";<a name="line.49"></a>
+<span class="sourceLineNo">050</span> private final String[] filePaths;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private final FileChannel[] fileChannels;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private final RandomAccessFile[] rafs;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final ReentrantLock[] channelLocks;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private final long sizePerFile;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private final long capacity;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> throws IOException {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.sizePerFile = capacity / filePaths.length;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> this.filePaths = filePaths;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.66"></a>
+<span class="sourceLineNo">067</span> if (!maintainPersistence) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> for (String filePath : filePaths) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> File file = new File(filePath);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (file.exists()) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (LOG.isDebugEnabled()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> file.delete();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> // If deletion fails still we can manage with the writes<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> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.79"></a>
+<span class="sourceLineNo">080</span> this.channelLocks = new ReentrantLock[filePaths.length];<a name="line.80"></a>
+<span class="sourceLineNo">081</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> String filePath = filePaths[i];<a name="line.82"></a>
+<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.84"></a>
+<span class="sourceLineNo">085</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (totalSpace < sizePerFile) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // The next setting length will throw exception,logging this message<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // is just used for the detail reason of exception，<a name="line.88"></a>
+<span class="sourceLineNo">089</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> + " total space under " + filePath + ", not enough for requested "<a name="line.90"></a>
+<span class="sourceLineNo">091</span> + StringUtils.byteDesc(sizePerFile);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> LOG.warn(msg);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span> rafs[i].setLength(sizePerFile);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> fileChannels[i] = rafs[i].getChannel();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> channelLocks[i] = new ReentrantLock();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.97"></a>
+<span class="sourceLineNo">098</span> + ", on the path:" + filePath);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> } catch (IOException fex) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> shutdown();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> throw fex;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> @Override<a name="line.107"></a>
+<span class="sourceLineNo">108</span> public String toString() {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.109"></a>
+<span class="sourceLineNo">110</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<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> * File IO engine is always able to support persistent storage for the cache<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return true<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean isPersistent() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return true;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Transfers data from file to the given byte buffer<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param offset The offset in the file where the first byte to be read<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param length The length of buffer that should be allocated for reading<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * from the file channel<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return number of bytes read<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @throws IOException<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Override<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (length != 0) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // the results are not corrupted before consuming them.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (dstBuffer.limit() != length) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.142"></a>
+<span class="sourceLineNo">143</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> @VisibleForTesting<a name="line.149"></a>
+<span class="sourceLineNo">150</span> void closeFileChannels() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (FileChannel fileChannel: fileChannels) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> fileChannel.close();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> } catch (IOException e) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.warn("Failed to close FileChannel", e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Transfers data from the given byte buffer to file<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @param offset The offset in the file where the first byte to be written<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @throws IOException<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (!srcBuffer.hasRemaining()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> accessFile(writeAccessor, srcBuffer, offset);<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> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Sync the data to file after writing<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @throws IOException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void sync() throws IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> try {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (fileChannels[i] != null) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> fileChannels[i].force(true);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> } catch (IOException ie) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throw ie;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Close the file<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public void shutdown() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> try {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (fileChannels[i] != null) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> fileChannels[i].close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (rafs[i] != null) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> rafs[i].close();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> } catch (IOException ex) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> assert srcBuffer.hasArray();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.215"></a>
+<span class="sourceLineNo">216</span> srcBuffer.remaining()), offset);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.219"></a>
+<span class="sourceLineNo">220</span> long globalOffset) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> int startFileNum = getFileNum(globalOffset);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> int remainingAccessDataLen = buffer.remaining();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> int accessFileNum = startFileNum;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> int bufLimit = buffer.limit();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> while (true) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.228"></a>
+<span class="sourceLineNo">229</span> int accessLen = 0;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (endFileNum > accessFileNum) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> // short the limit;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.232"></a>
+<span class="sourceLineNo">233</span> + sizePerFile - accessOffset));<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> } catch (ClosedByInterruptException e) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> throw e;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } catch (ClosedChannelException e) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> refreshFileConnection(accessFileNum, e);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> continue;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // recover the limit<a name="line.243"></a>
+<span class="sourceLineNo">244</span> buffer.limit(bufLimit);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (accessLen < remainingAccessDataLen) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> remainingAccessDataLen -= accessLen;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> accessFileNum++;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> accessOffset = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> break;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (accessFileNum >= fileChannels.length) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.254"></a>
+<span class="sourceLineNo">255</span> + globalOffset);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * Get the absolute offset in given file with the relative global offset.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param fileNum<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @param globalOffset<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return the absolute offset<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return globalOffset - fileNum * sizePerFile;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> private int getFileNum(long offset) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> if (offset < 0) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> int fileNum = (int) (offset / sizePerFile);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (fileNum >= fileChannels.length) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new RuntimeException("Not expected offset " + offset<a name="line.276"></a>
+<span class="sourceLineNo">277</span> + " where capacity=" + capacity);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return fileNum;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> @VisibleForTesting<a name="line.282"></a>
+<span class="sourceLineNo">283</span> FileChannel[] getFileChannels() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return fileChannels;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> @VisibleForTesting<a name="line.287"></a>
+<span class="sourceLineNo">288</span> void refreshFileConnection(int accessFileNum, IOException ioe) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> ReentrantLock channelLock = channelLocks[accessFileNum];<a name="line.289"></a>
+<span class="sourceLineNo">290</span> channelLock.lock();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> try {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (fileChannel != null) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // Don't re-open a channel if we were waiting on another<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // thread to re-open the channel and it is now open.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (fileChannel.isOpen()) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> fileChannel.close();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file: "<a name="line.301"></a>
+<span class="sourceLineNo">302</span> + filePaths[accessFileNum], ioe);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> } finally{<a name="line.305"></a>
+<span class="sourceLineNo">306</span> channelLock.unlock();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> private static interface FileAccessor {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.311"></a>
+<span class="sourceLineNo">312</span> throws IOException;<a name="line.312"></a>
<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>}<a name="line.314"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> private static class FileReadAccessor implements FileAccessor {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> long accessOffset) throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Override<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long accessOffset) throws IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return fileChannel.write(byteBuffer, accessOffset);<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>}<a name="line.330"></a>
[31/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 63e54e3..b11167e 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -273,12 +273,12 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">CacheConfig.ExternalBlockCaches</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType.BlockCategory</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.MemoryType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">Cacheable.MemoryType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index 6a2998c..7600159 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -349,9 +349,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index 626507e..81c504b 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -293,10 +293,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TableSplit.Version</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html b/devapidocs/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
index 4f61167..ed41587 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
@@ -957,7 +957,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>initialize</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1478">initialize</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1495">initialize</a>()
throws <a href="../../../../../../org/apache/hadoop/hbase/HBaseIOException.html" title="class in org.apache.hadoop.hbase">HBaseIOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalancer.html#initialize--">LoadBalancer</a></code></span></div>
<div class="block">Initialize the load balancer. Must be called after setters.</div>
@@ -975,7 +975,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>regionOnline</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1482">regionOnline</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1499">regionOnline</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalancer.html#regionOnline-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.ServerName-">LoadBalancer</a></code></span></div>
<div class="block">Marks the region as online at balancer.</div>
@@ -991,7 +991,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>regionOffline</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1486">regionOffline</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1503">regionOffline</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalancer.html#regionOffline-org.apache.hadoop.hbase.client.RegionInfo-">LoadBalancer</a></code></span></div>
<div class="block">Marks the region as offline at balancer.</div>
<dl>
@@ -1006,7 +1006,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>isStopped</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1490">isStopped</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1507">isStopped</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html#isStopped--">isStopped</a></code> in interface <code><a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" title="interface in org.apache.hadoop.hbase">Stoppable</a></code></dd>
@@ -1021,7 +1021,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>stop</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1495">stop</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> why)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1512">stop</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> why)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/hadoop/hbase/Stoppable.html#stop-java.lang.String-">Stoppable</a></code></span></div>
<div class="block">Stop this service.
Implementers should favor logging errors over throwing RuntimeExceptions.</div>
@@ -1039,7 +1039,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>randomAssignment</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1503">randomAssignment</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html" title="class in org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a> cluster,
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1520">randomAssignment</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html" title="class in org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a> cluster,
<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> regionInfo,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers)</pre>
<div class="block">Used to assign a single region to a random server.</div>
@@ -1051,7 +1051,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>roundRobinAssignment</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1522">roundRobinAssignment</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html" title="class in org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a> cluster,
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1539">roundRobinAssignment</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html" title="class in org.apache.hadoop.hbase.master.balancer">BaseLoadBalancer.Cluster</a> cluster,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>> regions,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>> unassignedRegions,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>> servers,
@@ -1065,7 +1065,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockList">
<li class="blockList">
<h4>getRegionAssignmentsByServer</h4>
-<pre>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1552">getRegionAssignmentsByServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.clie
nt">RegionInfo</a>> regions)</pre>
+<pre>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>>> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1569">getRegionAssignmentsByServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.clie
nt">RegionInfo</a>> regions)</pre>
</li>
</ul>
<a name="onConfigurationChange-org.apache.hadoop.conf.Configuration-">
@@ -1074,7 +1074,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/LoadBalance
<ul class="blockListLast">
<li class="blockList">
<h4>onConfigurationChange</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1562">onConfigurationChange</a>(org.apache.hadoop.conf.Configuration conf)</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html#line.1579">onConfigurationChange</a>(org.apache.hadoop.conf.Configuration conf)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/hadoop/hbase/conf/ConfigurationObserver.html#onConfigurationChange-org.apache.hadoop.conf.Configuration-">ConfigurationObserver</a></code></span></div>
<div class="block">This method would be called by the <a href="../../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" title="class in org.apache.hadoop.hbase.conf"><code>ConfigurationManager</code></a>
object when the <code>Configuration</code> object is reloaded from disk.</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
index ad40e69..eb945fb 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html
@@ -197,8 +197,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.LocalityType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.Action.Type.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.Action.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="../../../../../../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.LocalityType.html" title="enum in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BaseLoadBalancer.Cluster.LocalityType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html b/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
index 9152464..55644d3 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html
@@ -105,7 +105,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private static interface <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.446">CleanerChore.Action</a><T></pre>
+<pre>private static interface <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.452">CleanerChore.Action</a><T></pre>
</li>
</ul>
</div>
@@ -149,7 +149,7 @@ var activeTableTab = "activeTableTab";
<ul class="blockListLast">
<li class="blockList">
<h4>act</h4>
-<pre><a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html" title="type parameter in CleanerChore.Action">T</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html#line.447">act</a>()
+<pre><a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html" title="type parameter in CleanerChore.Action">T</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html#line.453">act</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html b/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
index 82070ed..8b46848 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html
@@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.454">CleanerChore.CleanerTask</a>
+<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.460">CleanerChore.CleanerTask</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/RecursiveTask.html?is-external=true" title="class or interface in java.util.concurrent">RecursiveTask</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>></pre>
<div class="block">Attemps to clean up a directory, its subdirectories, and files.
Return value is true if everything was deleted. false on partial / total failures.</div>
@@ -259,7 +259,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockList">
<li class="blockList">
<h4>dir</h4>
-<pre>private final org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.455">dir</a></pre>
+<pre>private final org.apache.hadoop.fs.Path <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.461">dir</a></pre>
</li>
</ul>
<a name="root">
@@ -268,7 +268,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockListLast">
<li class="blockList">
<h4>root</h4>
-<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.456">root</a></pre>
+<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.462">root</a></pre>
</li>
</ul>
</li>
@@ -285,7 +285,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockList">
<li class="blockList">
<h4>CleanerTask</h4>
-<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.458">CleanerTask</a>(org.apache.hadoop.fs.FileStatus dir,
+<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.464">CleanerTask</a>(org.apache.hadoop.fs.FileStatus dir,
boolean root)</pre>
</li>
</ul>
@@ -295,7 +295,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockListLast">
<li class="blockList">
<h4>CleanerTask</h4>
-<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.462">CleanerTask</a>(org.apache.hadoop.fs.Path dir,
+<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.468">CleanerTask</a>(org.apache.hadoop.fs.Path dir,
boolean root)</pre>
</li>
</ul>
@@ -313,7 +313,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockList">
<li class="blockList">
<h4>compute</h4>
-<pre>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.468">compute</a>()</pre>
+<pre>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.474">compute</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/RecursiveTask.html?is-external=true#compute--" title="class or interface in java.util.concurrent">compute</a></code> in class <code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/RecursiveTask.html?is-external=true" title="class or interface in java.util.concurrent">RecursiveTask</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>></code></dd>
@@ -326,7 +326,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockList">
<li class="blockList">
<h4>getFilteredStatus</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.FileStatus> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.520">getFilteredStatus</a>(org.apache.hbase.thirdparty.com.google.common.base.Predicate<org.apache.hadoop.fs.FileStatus> function)
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.FileStatus> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.526">getFilteredStatus</a>(org.apache.hbase.thirdparty.com.google.common.base.Predicate<org.apache.hadoop.fs.FileStatus> function)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Get FileStatus with filter.
Pay attention that FSUtils #listStatusWithStatusFilter would return null,
@@ -347,7 +347,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockList">
<li class="blockList">
<h4>deleteAction</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.530">deleteAction</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html" title="interface in org.apache.hadoop.hbase.master.cleaner">CleanerChore.Action</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>> deletion,
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.536">deleteAction</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html" title="interface in org.apache.hadoop.hbase.master.cleaner">CleanerChore.Action</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>> deletion,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> type)</pre>
<div class="block">Perform a delete on a specified type.</div>
<dl>
@@ -365,7 +365,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/
<ul class="blockListLast">
<li class="blockList">
<h4>getCleanResult</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.559">getCleanResult</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html" title="class in org.apache.hadoop.hbase.master.cleaner">CleanerChore.CleanerTask</a>> tasks)
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html#line.565">getCleanResult</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html" title="class in org.apache.hadoop.hbase.master.cleaner">CleanerChore.CleanerTask</a>> tasks)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Get cleaner results of subdirs.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html b/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
index 3f3af34..6a7b65d 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html
@@ -671,7 +671,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>preRunCleaner</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.294">preRunCleaner</a>()</pre>
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.300">preRunCleaner</a>()</pre>
</li>
</ul>
<a name="runCleaner--">
@@ -680,7 +680,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>runCleaner</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.298">runCleaner</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.304">runCleaner</a>()</pre>
</li>
</ul>
<a name="sortByConsumedSpace-java.util.List-">
@@ -689,7 +689,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>sortByConsumedSpace</h4>
-<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.309">sortByConsumedSpace</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.FileStatus> dirs)</pre>
+<pre>private void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.315">sortByConsumedSpace</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.FileStatus> dirs)</pre>
<div class="block">Sort the given list in (descending) order of the space each element takes</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -703,7 +703,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>checkAndDeleteFiles</h4>
-<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.348">checkAndDeleteFiles</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.FileStatus> files)</pre>
+<pre>private boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.354">checkAndDeleteFiles</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.FileStatus> files)</pre>
<div class="block">Run the given files through each of the cleaners to see if it should be deleted, deleting it if
necessary.</div>
<dl>
@@ -720,7 +720,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>deleteFiles</h4>
-<pre>protected int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.398">deleteFiles</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a><org.apache.hadoop.fs.FileStatus> filesToDelete)</pre>
+<pre>protected int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.404">deleteFiles</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a><org.apache.hadoop.fs.FileStatus> filesToDelete)</pre>
<div class="block">Delete the given files</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -736,7 +736,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>cleanup</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.421">cleanup</a>()</pre>
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.427">cleanup</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/ScheduledChore.html#cleanup--">ScheduledChore</a></code></span></div>
<div class="block">Override to run cleanup tasks when the Chore encounters an error and must stop running</div>
<dl>
@@ -751,7 +751,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>getChorePoolSize</h4>
-<pre>int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.432">getChorePoolSize</a>()</pre>
+<pre>int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.438">getChorePoolSize</a>()</pre>
</li>
</ul>
<a name="setEnabled-boolean-">
@@ -760,7 +760,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockList">
<li class="blockList">
<h4>setEnabled</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.439">setEnabled</a>(boolean enabled)</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.445">setEnabled</a>(boolean enabled)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>enabled</code> - </dd>
@@ -773,7 +773,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/conf/Configuration
<ul class="blockListLast">
<li class="blockList">
<h4>getEnabled</h4>
-<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.443">getEnabled</a>()</pre>
+<pre>public boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#line.449">getEnabled</a>()</pre>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index ac4b7c0..7de2ad7 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -347,10 +347,10 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index e602642..550d779 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -208,8 +208,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">ServerProcedureInterface.ServerOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index e49713c..68a3a27 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -442,18 +442,18 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaTableAccessor.QueryType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 422a5fa..51096b7 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -212,11 +212,11 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockedResourceType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockedResourceType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index bd3f539..cb3eddd 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -229,13 +229,13 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index 2636f5a..d941e23 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -704,20 +704,20 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index b377318..23060c2 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -131,8 +131,8 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
index c20ff47..034077c 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
@@ -110,8 +110,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.FilterType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.FilterType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.FilterType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.FilterType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index 5a7e325..bf7ef69 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -137,9 +137,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index dfa02b5..7ba3a64 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -191,8 +191,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index 8e41b8e..474f541 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -199,8 +199,8 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftServerRunner.ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftServerRunner.ImplType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index bf2f539..b5a93b5 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -532,14 +532,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLock.ReferenceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HBaseFsck.ErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HBaseFsck.ErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a><T>)</li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
</ul>
</li>
</ul>
[29/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
index 3647d12..25faf76 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
@@ -34,292 +34,308 @@
<span class="sourceLineNo">026</span>import java.nio.channels.ClosedChannelException;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import java.nio.channels.FileChannel;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import java.util.Arrays;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.util.StringUtils;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * IO engine that stores data to a file on the local file system.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@InterfaceAudience.Private<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public class FileIOEngine implements IOEngine {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.47"></a>
-<span class="sourceLineNo">048</span> public static final String FILE_DELIMITER = ",";<a name="line.48"></a>
-<span class="sourceLineNo">049</span> private final String[] filePaths;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private final FileChannel[] fileChannels;<a name="line.50"></a>
-<span class="sourceLineNo">051</span> private final RandomAccessFile[] rafs;<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private final long sizePerFile;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final long capacity;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.59"></a>
-<span class="sourceLineNo">060</span> throws IOException {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> this.sizePerFile = capacity / filePaths.length;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> this.filePaths = filePaths;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.64"></a>
-<span class="sourceLineNo">065</span> if (!maintainPersistence) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> for (String filePath : filePaths) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> File file = new File(filePath);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> if (file.exists()) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (LOG.isDebugEnabled()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span> file.delete();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> // If deletion fails still we can manage with the writes<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> String filePath = filePaths[i];<a name="line.79"></a>
-<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.81"></a>
-<span class="sourceLineNo">082</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (totalSpace < sizePerFile) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // The next setting length will throw exception,logging this message<a name="line.84"></a>
-<span class="sourceLineNo">085</span> // is just used for the detail reason of exception，<a name="line.85"></a>
-<span class="sourceLineNo">086</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.86"></a>
-<span class="sourceLineNo">087</span> + " total space under " + filePath + ", not enough for requested "<a name="line.87"></a>
-<span class="sourceLineNo">088</span> + StringUtils.byteDesc(sizePerFile);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> LOG.warn(msg);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> rafs[i].setLength(sizePerFile);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> fileChannels[i] = rafs[i].getChannel();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.93"></a>
-<span class="sourceLineNo">094</span> + ", on the path:" + filePath);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> } catch (IOException fex) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> shutdown();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> throw fex;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public String toString() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.105"></a>
-<span class="sourceLineNo">106</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * File IO engine is always able to support persistent storage for the cache<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @return true<a name="line.111"></a>
-<span class="sourceLineNo">112</span> */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public boolean isPersistent() {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Transfers data from file to the given byte buffer<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param offset The offset in the file where the first byte to be read<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param length The length of buffer that should be allocated for reading<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * from the file channel<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @return number of bytes read<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @throws IOException<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (length != 0) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // the results are not corrupted before consuming them.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> if (dstBuffer.limit() != length) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.138"></a>
-<span class="sourceLineNo">139</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<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> @VisibleForTesting<a name="line.145"></a>
-<span class="sourceLineNo">146</span> void closeFileChannels() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> for (FileChannel fileChannel: fileChannels) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> try {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> fileChannel.close();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> } catch (IOException e) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.warn("Failed to close FileChannel", e);<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> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * Transfers data from the given byte buffer to file<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * @param offset The offset in the file where the first byte to be written<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * @throws IOException<a name="line.160"></a>
-<span class="sourceLineNo">161</span> */<a name="line.161"></a>
-<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
-<span class="sourceLineNo">163</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (!srcBuffer.hasRemaining()) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> return;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> accessFile(writeAccessor, srcBuffer, offset);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Sync the data to file after writing<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @throws IOException<a name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span> public void sync() throws IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (fileChannels[i] != null) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> fileChannels[i].force(true);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> } catch (IOException ie) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> throw ie;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * Close the file<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void shutdown() {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> try {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> if (fileChannels[i] != null) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> fileChannels[i].close();<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (rafs[i] != null) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> rafs[i].close();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } catch (IOException ex) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> @Override<a name="line.207"></a>
-<span class="sourceLineNo">208</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> assert srcBuffer.hasArray();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.211"></a>
-<span class="sourceLineNo">212</span> srcBuffer.remaining()), offset);<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">215</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.215"></a>
-<span class="sourceLineNo">216</span> long globalOffset) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> int startFileNum = getFileNum(globalOffset);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> int remainingAccessDataLen = buffer.remaining();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> int accessFileNum = startFileNum;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> int bufLimit = buffer.limit();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> while (true) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.224"></a>
-<span class="sourceLineNo">225</span> int accessLen = 0;<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (endFileNum > accessFileNum) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // short the limit;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.228"></a>
-<span class="sourceLineNo">229</span> + sizePerFile - accessOffset));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span> try {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (ClosedByInterruptException e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> throw e;<a name="line.234"></a>
-<span class="sourceLineNo">235</span> } catch (ClosedChannelException e) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file. ", e);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> refreshFileConnection(accessFileNum);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> continue;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // recover the limit<a name="line.240"></a>
-<span class="sourceLineNo">241</span> buffer.limit(bufLimit);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (accessLen < remainingAccessDataLen) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> remainingAccessDataLen -= accessLen;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> accessFileNum++;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> accessOffset = 0;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> break;<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (accessFileNum >= fileChannels.length) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.250"></a>
-<span class="sourceLineNo">251</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.251"></a>
-<span class="sourceLineNo">252</span> + globalOffset);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * Get the absolute offset in given file with the relative global offset.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> * @param fileNum<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * @param globalOffset<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * @return the absolute offset<a name="line.261"></a>
-<span class="sourceLineNo">262</span> */<a name="line.262"></a>
-<span class="sourceLineNo">263</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> return globalOffset - fileNum * sizePerFile;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> private int getFileNum(long offset) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> if (offset < 0) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> int fileNum = (int) (offset / sizePerFile);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (fileNum >= fileChannels.length) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> throw new RuntimeException("Not expected offset " + offset<a name="line.273"></a>
-<span class="sourceLineNo">274</span> + " where capacity=" + capacity);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> return fileNum;<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> @VisibleForTesting<a name="line.279"></a>
-<span class="sourceLineNo">280</span> FileChannel[] getFileChannels() {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return fileChannels;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> @VisibleForTesting<a name="line.284"></a>
-<span class="sourceLineNo">285</span> void refreshFileConnection(int accessFileNum) throws IOException {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (fileChannel != null) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> fileChannel.close();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.290"></a>
-<span class="sourceLineNo">291</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> private static interface FileAccessor {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.295"></a>
-<span class="sourceLineNo">296</span> throws IOException;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> private static class FileReadAccessor implements FileAccessor {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> @Override<a name="line.300"></a>
-<span class="sourceLineNo">301</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.301"></a>
-<span class="sourceLineNo">302</span> long accessOffset) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
-<span class="sourceLineNo">309</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> long accessOffset) throws IOException {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> return fileChannel.write(byteBuffer, accessOffset);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">029</span>import java.util.concurrent.locks.ReentrantLock;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.io.hfile.Cacheable;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.CacheableDeserializer;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.nio.ByteBuff;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.nio.SingleByteBuff;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.util.StringUtils;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * IO engine that stores data to a file on the local file system.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public class FileIOEngine implements IOEngine {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(FileIOEngine.class);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> public static final String FILE_DELIMITER = ",";<a name="line.49"></a>
+<span class="sourceLineNo">050</span> private final String[] filePaths;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private final FileChannel[] fileChannels;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private final RandomAccessFile[] rafs;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final ReentrantLock[] channelLocks;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private final long sizePerFile;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private final long capacity;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private FileReadAccessor readAccessor = new FileReadAccessor();<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private FileWriteAccessor writeAccessor = new FileWriteAccessor();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> public FileIOEngine(long capacity, boolean maintainPersistence, String... filePaths)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> throws IOException {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this.sizePerFile = capacity / filePaths.length;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> this.capacity = this.sizePerFile * filePaths.length;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> this.filePaths = filePaths;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.fileChannels = new FileChannel[filePaths.length];<a name="line.66"></a>
+<span class="sourceLineNo">067</span> if (!maintainPersistence) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> for (String filePath : filePaths) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> File file = new File(filePath);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> if (file.exists()) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (LOG.isDebugEnabled()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> LOG.debug("File " + filePath + " already exists. Deleting!!");<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> file.delete();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> // If deletion fails still we can manage with the writes<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> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span> this.rafs = new RandomAccessFile[filePaths.length];<a name="line.79"></a>
+<span class="sourceLineNo">080</span> this.channelLocks = new ReentrantLock[filePaths.length];<a name="line.80"></a>
+<span class="sourceLineNo">081</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> String filePath = filePaths[i];<a name="line.82"></a>
+<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> rafs[i] = new RandomAccessFile(filePath, "rw");<a name="line.84"></a>
+<span class="sourceLineNo">085</span> long totalSpace = new File(filePath).getTotalSpace();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (totalSpace < sizePerFile) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // The next setting length will throw exception,logging this message<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // is just used for the detail reason of exception，<a name="line.88"></a>
+<span class="sourceLineNo">089</span> String msg = "Only " + StringUtils.byteDesc(totalSpace)<a name="line.89"></a>
+<span class="sourceLineNo">090</span> + " total space under " + filePath + ", not enough for requested "<a name="line.90"></a>
+<span class="sourceLineNo">091</span> + StringUtils.byteDesc(sizePerFile);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> LOG.warn(msg);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span> rafs[i].setLength(sizePerFile);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> fileChannels[i] = rafs[i].getChannel();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> channelLocks[i] = new ReentrantLock();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> LOG.info("Allocating cache " + StringUtils.byteDesc(sizePerFile)<a name="line.97"></a>
+<span class="sourceLineNo">098</span> + ", on the path:" + filePath);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> } catch (IOException fex) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> LOG.error("Failed allocating cache on " + filePath, fex);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> shutdown();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> throw fex;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> @Override<a name="line.107"></a>
+<span class="sourceLineNo">108</span> public String toString() {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return "ioengine=" + this.getClass().getSimpleName() + ", paths="<a name="line.109"></a>
+<span class="sourceLineNo">110</span> + Arrays.asList(filePaths) + ", capacity=" + String.format("%,d", this.capacity);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<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> * File IO engine is always able to support persistent storage for the cache<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @return true<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean isPersistent() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return true;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Transfers data from file to the given byte buffer<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * @param offset The offset in the file where the first byte to be read<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * @param length The length of buffer that should be allocated for reading<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * from the file channel<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * @return number of bytes read<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @throws IOException<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Override<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public Cacheable read(long offset, int length, CacheableDeserializer<Cacheable> deserializer)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throws IOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> Preconditions.checkArgument(length >= 0, "Length of read can not be less than 0.");<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ByteBuffer dstBuffer = ByteBuffer.allocate(length);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (length != 0) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> accessFile(readAccessor, dstBuffer, offset);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // The buffer created out of the fileChannel is formed by copying the data from the file<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // Hence in this case there is no shared memory that we point to. Even if the BucketCache evicts<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // this buffer from the file the data is already copied and there is no need to ensure that<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // the results are not corrupted before consuming them.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (dstBuffer.limit() != length) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> throw new RuntimeException("Only " + dstBuffer.limit() + " bytes read, " + length<a name="line.142"></a>
+<span class="sourceLineNo">143</span> + " expected");<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> return deserializer.deserialize(new SingleByteBuff(dstBuffer), true, MemoryType.EXCLUSIVE);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> @VisibleForTesting<a name="line.149"></a>
+<span class="sourceLineNo">150</span> void closeFileChannels() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> for (FileChannel fileChannel: fileChannels) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> try {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> fileChannel.close();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> } catch (IOException e) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> LOG.warn("Failed to close FileChannel", e);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Transfers data from the given byte buffer to file<a name="line.161"></a>
+<span class="sourceLineNo">162</span> * @param srcBuffer the given byte buffer from which bytes are to be read<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @param offset The offset in the file where the first byte to be written<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @throws IOException<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span> public void write(ByteBuffer srcBuffer, long offset) throws IOException {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (!srcBuffer.hasRemaining()) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> accessFile(writeAccessor, srcBuffer, offset);<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> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Sync the data to file after writing<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @throws IOException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> */<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void sync() throws IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> for (int i = 0; i < fileChannels.length; i++) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> try {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (fileChannels[i] != null) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> fileChannels[i].force(true);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> } catch (IOException ie) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> LOG.warn("Failed syncing data to " + this.filePaths[i]);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> throw ie;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Close the file<a name="line.193"></a>
+<span class="sourceLineNo">194</span> */<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public void shutdown() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> for (int i = 0; i < filePaths.length; i++) {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> try {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (fileChannels[i] != null) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> fileChannels[i].close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (rafs[i] != null) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> rafs[i].close();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> } catch (IOException ex) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> LOG.error("Failed closing " + filePaths[i] + " when shudown the IOEngine", ex);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> public void write(ByteBuff srcBuffer, long offset) throws IOException {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> // When caching block into BucketCache there will be single buffer backing for this HFileBlock.<a name="line.213"></a>
+<span class="sourceLineNo">214</span> assert srcBuffer.hasArray();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> write(ByteBuffer.wrap(srcBuffer.array(), srcBuffer.arrayOffset(),<a name="line.215"></a>
+<span class="sourceLineNo">216</span> srcBuffer.remaining()), offset);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private void accessFile(FileAccessor accessor, ByteBuffer buffer,<a name="line.219"></a>
+<span class="sourceLineNo">220</span> long globalOffset) throws IOException {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> int startFileNum = getFileNum(globalOffset);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> int remainingAccessDataLen = buffer.remaining();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> int endFileNum = getFileNum(globalOffset + remainingAccessDataLen - 1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> int accessFileNum = startFileNum;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> long accessOffset = getAbsoluteOffsetInFile(accessFileNum, globalOffset);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> int bufLimit = buffer.limit();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> while (true) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.228"></a>
+<span class="sourceLineNo">229</span> int accessLen = 0;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (endFileNum > accessFileNum) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> // short the limit;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> buffer.limit((int) (buffer.limit() - remainingAccessDataLen<a name="line.232"></a>
+<span class="sourceLineNo">233</span> + sizePerFile - accessOffset));<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> accessLen = accessor.access(fileChannel, buffer, accessOffset);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> } catch (ClosedByInterruptException e) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> throw e;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } catch (ClosedChannelException e) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> refreshFileConnection(accessFileNum, e);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> continue;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // recover the limit<a name="line.243"></a>
+<span class="sourceLineNo">244</span> buffer.limit(bufLimit);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (accessLen < remainingAccessDataLen) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> remainingAccessDataLen -= accessLen;<a name="line.246"></a>
+<span class="sourceLineNo">247</span> accessFileNum++;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> accessOffset = 0;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> } else {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> break;<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (accessFileNum >= fileChannels.length) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> throw new IOException("Required data len " + StringUtils.byteDesc(buffer.remaining())<a name="line.253"></a>
+<span class="sourceLineNo">254</span> + " exceed the engine's capacity " + StringUtils.byteDesc(capacity) + " where offset="<a name="line.254"></a>
+<span class="sourceLineNo">255</span> + globalOffset);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * Get the absolute offset in given file with the relative global offset.<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param fileNum<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @param globalOffset<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return the absolute offset<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> private long getAbsoluteOffsetInFile(int fileNum, long globalOffset) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return globalOffset - fileNum * sizePerFile;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> private int getFileNum(long offset) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> if (offset < 0) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throw new IllegalArgumentException("Unexpected offset " + offset);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> int fileNum = (int) (offset / sizePerFile);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (fileNum >= fileChannels.length) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> throw new RuntimeException("Not expected offset " + offset<a name="line.276"></a>
+<span class="sourceLineNo">277</span> + " where capacity=" + capacity);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return fileNum;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> @VisibleForTesting<a name="line.282"></a>
+<span class="sourceLineNo">283</span> FileChannel[] getFileChannels() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return fileChannels;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> @VisibleForTesting<a name="line.287"></a>
+<span class="sourceLineNo">288</span> void refreshFileConnection(int accessFileNum, IOException ioe) throws IOException {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> ReentrantLock channelLock = channelLocks[accessFileNum];<a name="line.289"></a>
+<span class="sourceLineNo">290</span> channelLock.lock();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> try {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> FileChannel fileChannel = fileChannels[accessFileNum];<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (fileChannel != null) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // Don't re-open a channel if we were waiting on another<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // thread to re-open the channel and it is now open.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (fileChannel.isOpen()) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> fileChannel.close();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> LOG.warn("Caught ClosedChannelException accessing BucketCache, reopening file: "<a name="line.301"></a>
+<span class="sourceLineNo">302</span> + filePaths[accessFileNum], ioe);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> rafs[accessFileNum] = new RandomAccessFile(filePaths[accessFileNum], "rw");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> fileChannels[accessFileNum] = rafs[accessFileNum].getChannel();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> } finally{<a name="line.305"></a>
+<span class="sourceLineNo">306</span> channelLock.unlock();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> private static interface FileAccessor {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> int access(FileChannel fileChannel, ByteBuffer byteBuffer, long accessOffset)<a name="line.311"></a>
+<span class="sourceLineNo">312</span> throws IOException;<a name="line.312"></a>
<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span>}<a name="line.314"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> private static class FileReadAccessor implements FileAccessor {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> long accessOffset) throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> return fileChannel.read(byteBuffer, accessOffset);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> private static class FileWriteAccessor implements FileAccessor {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Override<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public int access(FileChannel fileChannel, ByteBuffer byteBuffer,<a name="line.325"></a>
+<span class="sourceLineNo">326</span> long accessOffset) throws IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> return fileChannel.write(byteBuffer, accessOffset);<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>}<a name="line.330"></a>
[06/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
index 869f6a1..3b08b86 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.SeenRowTracker.html
@@ -341,2502 +341,2502 @@
<span class="sourceLineNo">333</span> // a hbase checksum verification failure will cause unit tests to fail<a name="line.333"></a>
<span class="sourceLineNo">334</span> ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.334"></a>
<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> // if conf is provided, prevent contention for ports if other hbase thread(s) are running<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (conf != null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.338"></a>
-<span class="sourceLineNo">339</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> LOG.debug("Config property {} changed to -1", HConstants.MASTER_INFO_PORT);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> LOG.debug("Config property {} changed to -1", HConstants.REGIONSERVER_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> // Save this for when setting default file:// breaks things<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // Every cluster is a local cluster until we start DFS<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Note that conf could be null, but this.conf will not be<a name="line.354"></a>
-<span class="sourceLineNo">355</span> String dataTestDir = getDataTestDir().toString();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.conf.set("fs.defaultFS","file:///");<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> /**<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @return a normal HBaseTestingUtility<a name="line.364"></a>
-<span class="sourceLineNo">365</span> */<a name="line.365"></a>
-<span class="sourceLineNo">366</span> @Deprecated<a name="line.366"></a>
-<span class="sourceLineNo">367</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return new HBaseTestingUtility();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return a normal HBaseTestingUtility<a name="line.373"></a>
-<span class="sourceLineNo">374</span> */<a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Deprecated<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return new HBaseTestingUtility(c);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> */<a name="line.382"></a>
-<span class="sourceLineNo">383</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> closeRegionAndWAL((HRegion)r);<a name="line.384"></a>
+<span class="sourceLineNo">336</span> // Save this for when setting default file:// breaks things<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Every cluster is a local cluster until we start DFS<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Note that conf could be null, but this.conf will not be<a name="line.340"></a>
+<span class="sourceLineNo">341</span> String dataTestDir = getDataTestDir().toString();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> this.conf.set("fs.defaultFS","file:///");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // If the value for random ports isn't set set it to true, thus making<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // tests opt-out for random port assignment<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.conf.setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS,<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true));<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> /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return a normal HBaseTestingUtility<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Deprecated<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return new HBaseTestingUtility();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @return a normal HBaseTestingUtility<a name="line.363"></a>
+<span class="sourceLineNo">364</span> */<a name="line.364"></a>
+<span class="sourceLineNo">365</span> @Deprecated<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> return new HBaseTestingUtility(c);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.371"></a>
+<span class="sourceLineNo">372</span> */<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> closeRegionAndWAL((HRegion)r);<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>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (r == null) return;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> r.close();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (r.getWAL() == null) return;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> r.getWAL().close();<a name="line.384"></a>
<span class="sourceLineNo">385</span> }<a name="line.385"></a>
<span class="sourceLineNo">386</span><a name="line.386"></a>
<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> */<a name="line.389"></a>
-<span class="sourceLineNo">390</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (r == null) return;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> r.close();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (r.getWAL() == null) return;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> r.getWAL().close();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * you use the returned Configuration since {@link Connection} instances<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * make a copy and use that. Do<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return Instance of Configuration.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> @Override<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public Configuration getConfiguration() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return super.getConfiguration();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> this.hbaseCluster = hbaseCluster;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * Give it a random name so can have many concurrent tests running if<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * System property, as it's what minidfscluster bases<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * instances -- another instance could grab the temporary<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * single instance only is how the minidfscluster works.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * We also create the underlying directory for<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.429"></a>
-<span class="sourceLineNo">430</span> *<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @return The calculated data test build directory, if newly-created.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected Path setupDataTestDir() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Path testPath = super.setupDataTestDir();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (null == testPath) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">388</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * you use the returned Configuration since {@link Connection} instances<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * make a copy and use that. Do<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.395"></a>
+<span class="sourceLineNo">396</span> * @return Instance of Configuration.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span> public Configuration getConfiguration() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return super.getConfiguration();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> this.hbaseCluster = hbaseCluster;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Give it a random name so can have many concurrent tests running if<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * System property, as it's what minidfscluster bases<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * instances -- another instance could grab the temporary<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * single instance only is how the minidfscluster works.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> *<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * We also create the underlying directory for<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.419"></a>
+<span class="sourceLineNo">420</span> *<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @return The calculated data test build directory, if newly-created.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> */<a name="line.422"></a>
+<span class="sourceLineNo">423</span> @Override<a name="line.423"></a>
+<span class="sourceLineNo">424</span> protected Path setupDataTestDir() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Path testPath = super.setupDataTestDir();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (null == testPath) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> createSubDirAndSystemProperty(<a name="line.430"></a>
+<span class="sourceLineNo">431</span> "hadoop.log.dir",<a name="line.431"></a>
+<span class="sourceLineNo">432</span> testPath, "hadoop-log-dir");<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // we want our own value to ensure uniqueness on the same machine<a name="line.435"></a>
+<span class="sourceLineNo">436</span> createSubDirAndSystemProperty(<a name="line.436"></a>
+<span class="sourceLineNo">437</span> "hadoop.tmp.dir",<a name="line.437"></a>
+<span class="sourceLineNo">438</span> testPath, "hadoop-tmp-dir");<a name="line.438"></a>
<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> createSubDirAndSystemProperty(<a name="line.440"></a>
-<span class="sourceLineNo">441</span> "hadoop.log.dir",<a name="line.441"></a>
-<span class="sourceLineNo">442</span> testPath, "hadoop-log-dir");<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // we want our own value to ensure uniqueness on the same machine<a name="line.445"></a>
-<span class="sourceLineNo">446</span> createSubDirAndSystemProperty(<a name="line.446"></a>
-<span class="sourceLineNo">447</span> "hadoop.tmp.dir",<a name="line.447"></a>
-<span class="sourceLineNo">448</span> testPath, "hadoop-tmp-dir");<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.450"></a>
-<span class="sourceLineNo">451</span> createSubDir(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> "mapreduce.cluster.local.dir",<a name="line.452"></a>
-<span class="sourceLineNo">453</span> testPath, "mapred-local-dir");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return testPath;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private void createSubDirAndSystemProperty(<a name="line.458"></a>
-<span class="sourceLineNo">459</span> String propertyName, Path parent, String subDirName){<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> String sysValue = System.getProperty(propertyName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (sysValue != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // There is already a value set. So we do nothing but hope<a name="line.464"></a>
-<span class="sourceLineNo">465</span> // that there will be no conflicts<a name="line.465"></a>
-<span class="sourceLineNo">466</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.466"></a>
-<span class="sourceLineNo">467</span> sysValue + " so I do NOT create it in " + parent);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> String confValue = conf.get(propertyName);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.warn(<a name="line.470"></a>
-<span class="sourceLineNo">471</span> propertyName + " property value differs in configuration and system: "+<a name="line.471"></a>
-<span class="sourceLineNo">472</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.472"></a>
-<span class="sourceLineNo">473</span> " Erasing configuration value by system value."<a name="line.473"></a>
-<span class="sourceLineNo">474</span> );<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> conf.set(propertyName, sysValue);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.478"></a>
-<span class="sourceLineNo">479</span> createSubDir(propertyName, parent, subDirName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * for the test filesystem by default<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @see #setupDataTestDirOnTestFS()<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @see #getTestFileSystem()<a name="line.488"></a>
+<span class="sourceLineNo">440</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.440"></a>
+<span class="sourceLineNo">441</span> createSubDir(<a name="line.441"></a>
+<span class="sourceLineNo">442</span> "mapreduce.cluster.local.dir",<a name="line.442"></a>
+<span class="sourceLineNo">443</span> testPath, "mapred-local-dir");<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> return testPath;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> private void createSubDirAndSystemProperty(<a name="line.448"></a>
+<span class="sourceLineNo">449</span> String propertyName, Path parent, String subDirName){<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> String sysValue = System.getProperty(propertyName);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (sysValue != null) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // There is already a value set. So we do nothing but hope<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // that there will be no conflicts<a name="line.455"></a>
+<span class="sourceLineNo">456</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.456"></a>
+<span class="sourceLineNo">457</span> sysValue + " so I do NOT create it in " + parent);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> String confValue = conf.get(propertyName);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.459"></a>
+<span class="sourceLineNo">460</span> LOG.warn(<a name="line.460"></a>
+<span class="sourceLineNo">461</span> propertyName + " property value differs in configuration and system: "+<a name="line.461"></a>
+<span class="sourceLineNo">462</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.462"></a>
+<span class="sourceLineNo">463</span> " Erasing configuration value by system value."<a name="line.463"></a>
+<span class="sourceLineNo">464</span> );<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> conf.set(propertyName, sysValue);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> } else {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.468"></a>
+<span class="sourceLineNo">469</span> createSubDir(propertyName, parent, subDirName);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * for the test filesystem by default<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @see #setupDataTestDirOnTestFS()<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @see #getTestFileSystem()<a name="line.478"></a>
+<span class="sourceLineNo">479</span> */<a name="line.479"></a>
+<span class="sourceLineNo">480</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> FileSystem fs = getTestFileSystem();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> /**<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return META table descriptor<a name="line.486"></a>
+<span class="sourceLineNo">487</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.488"></a>
<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> FileSystem fs = getTestFileSystem();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.492"></a>
+<span class="sourceLineNo">490</span> @Deprecated<a name="line.490"></a>
+<span class="sourceLineNo">491</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.492"></a>
<span class="sourceLineNo">493</span> }<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
<span class="sourceLineNo">496</span> * @return META table descriptor<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.498"></a>
-<span class="sourceLineNo">499</span> */<a name="line.499"></a>
-<span class="sourceLineNo">500</span> @Deprecated<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @return META table descriptor<a name="line.506"></a>
-<span class="sourceLineNo">507</span> */<a name="line.507"></a>
-<span class="sourceLineNo">508</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> try {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> } catch (IOException e) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * if the test relies on it.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * @return a unique path in the test filesystem<a name="line.520"></a>
-<span class="sourceLineNo">521</span> */<a name="line.521"></a>
-<span class="sourceLineNo">522</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (dataTestDirOnTestFS == null) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> setupDataTestDirOnTestFS();<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> return dataTestDirOnTestFS;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * if the test relies on it.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * @return a unique path in the test filesystem<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.535"></a>
-<span class="sourceLineNo">536</span> */<a name="line.536"></a>
-<span class="sourceLineNo">537</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * Sets up a path in test filesystem to be used by tests.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Creates a new directory if not already setup.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (dataTestDirOnTestFS != null) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.547"></a>
-<span class="sourceLineNo">548</span> + dataTestDirOnTestFS.toString());<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> /**<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.555"></a>
-<span class="sourceLineNo">556</span> */<a name="line.556"></a>
-<span class="sourceLineNo">557</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.558"></a>
-<span class="sourceLineNo">559</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.559"></a>
-<span class="sourceLineNo">560</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.560"></a>
-<span class="sourceLineNo">561</span> //the working directory, and create a unique sub dir there<a name="line.561"></a>
-<span class="sourceLineNo">562</span> FileSystem fs = getTestFileSystem();<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Path newDataTestDir;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> String randomStr = UUID.randomUUID().toString();<a name="line.564"></a>
-<span class="sourceLineNo">565</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } else {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path base = getBaseTestDirOnTestFS();<a name="line.570"></a>
-<span class="sourceLineNo">571</span> newDataTestDir = new Path(base, randomStr);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> return newDataTestDir;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * Cleans the test data directory on the test filesystem.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return True if we removed the test dirs<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * @throws IOException<a name="line.580"></a>
-<span class="sourceLineNo">581</span> */<a name="line.581"></a>
-<span class="sourceLineNo">582</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (ret)<a name="line.584"></a>
-<span class="sourceLineNo">585</span> dataTestDirOnTestFS = null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return ret;<a name="line.586"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> } catch (IOException e) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * if the test relies on it.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return a unique path in the test filesystem<a name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (dataTestDirOnTestFS == null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> setupDataTestDirOnTestFS();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> return dataTestDirOnTestFS;<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * if the test relies on it.<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return a unique path in the test filesystem<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.525"></a>
+<span class="sourceLineNo">526</span> */<a name="line.526"></a>
+<span class="sourceLineNo">527</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /**<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Sets up a path in test filesystem to be used by tests.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Creates a new directory if not already setup.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> if (dataTestDirOnTestFS != null) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.537"></a>
+<span class="sourceLineNo">538</span> + dataTestDirOnTestFS.toString());<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> /**<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> */<a name="line.546"></a>
+<span class="sourceLineNo">547</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.548"></a>
+<span class="sourceLineNo">549</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.549"></a>
+<span class="sourceLineNo">550</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.550"></a>
+<span class="sourceLineNo">551</span> //the working directory, and create a unique sub dir there<a name="line.551"></a>
+<span class="sourceLineNo">552</span> FileSystem fs = getTestFileSystem();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> Path newDataTestDir;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> String randomStr = UUID.randomUUID().toString();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> } else {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Path base = getBaseTestDirOnTestFS();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> newDataTestDir = new Path(base, randomStr);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return newDataTestDir;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Cleans the test data directory on the test filesystem.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * @return True if we removed the test dirs<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * @throws IOException<a name="line.570"></a>
+<span class="sourceLineNo">571</span> */<a name="line.571"></a>
+<span class="sourceLineNo">572</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (ret)<a name="line.574"></a>
+<span class="sourceLineNo">575</span> dataTestDirOnTestFS = null;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return ret;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> /**<a name="line.579"></a>
+<span class="sourceLineNo">580</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.580"></a>
+<span class="sourceLineNo">581</span> * @return True if we removed child<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * @throws IOException<a name="line.582"></a>
+<span class="sourceLineNo">583</span> */<a name="line.583"></a>
+<span class="sourceLineNo">584</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> return getTestFileSystem().delete(cpath, true);<a name="line.586"></a>
<span class="sourceLineNo">587</span> }<a name="line.587"></a>
<span class="sourceLineNo">588</span><a name="line.588"></a>
<span class="sourceLineNo">589</span> /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @return True if we removed child<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @throws IOException<a name="line.592"></a>
-<span class="sourceLineNo">593</span> */<a name="line.593"></a>
-<span class="sourceLineNo">594</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.595"></a>
-<span class="sourceLineNo">596</span> return getTestFileSystem().delete(cpath, true);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> /**<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * Start a minidfscluster.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @param servers How many DNs to start.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * @throws Exception<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @return The mini dfs cluster created.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> */<a name="line.605"></a>
-<span class="sourceLineNo">606</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.606"></a>
-<span class="sourceLineNo">607</span> return startMiniDFSCluster(servers, null);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * Start a minidfscluster.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * like HDFS block location verification.<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * datanodes will have the same host name.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param hosts hostnames DNs to run on.<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @throws Exception<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * @return The mini dfs cluster created.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> */<a name="line.620"></a>
-<span class="sourceLineNo">621</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.621"></a>
-<span class="sourceLineNo">622</span> throws Exception {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> if ( hosts != null && hosts.length != 0) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> } else {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> return startMiniDFSCluster(1, null);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span> * Start a minidfscluster.<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Can only create one.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * @param servers How many DNs to start.<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param hosts hostnames DNs to run on.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @throws Exception<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.636"></a>
-<span class="sourceLineNo">637</span> * @return The mini dfs cluster created.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> */<a name="line.638"></a>
-<span class="sourceLineNo">639</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.639"></a>
-<span class="sourceLineNo">640</span> throws Exception {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> private void setFs() throws IOException {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if(this.dfsCluster == null){<a name="line.645"></a>
-<span class="sourceLineNo">646</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> // re-enable this check with dfs<a name="line.652"></a>
-<span class="sourceLineNo">653</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.656"></a>
-<span class="sourceLineNo">657</span> throws Exception {<a name="line.657"></a>
-<span class="sourceLineNo">658</span> createDirsAndSetProperties();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.661"></a>
-<span class="sourceLineNo">662</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.662"></a>
-<span class="sourceLineNo">663</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.664"></a>
-<span class="sourceLineNo">665</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> TraceUtil.initTracer(conf);<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.669"></a>
-<span class="sourceLineNo">670</span> true, null, racks, hosts, null);<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> // Set this just-started cluster as our filesystem.<a name="line.672"></a>
-<span class="sourceLineNo">673</span> setFs();<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> // Wait for the cluster to be totally up<a name="line.675"></a>
-<span class="sourceLineNo">676</span> this.dfsCluster.waitClusterUp();<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //reset the test directory for test file system<a name="line.678"></a>
-<span class="sourceLineNo">679</span> dataTestDirOnTestFS = null;<a name="line.679"></a>
-<span class="sourceLineNo">680</span> String dataTestDir = getDataTestDir().toString();<a name="line.680"></a>
-<span class="sourceLineNo">681</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.681"></a>
-<span class="sourceLineNo">682</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.682"></a>
+<span class="sourceLineNo">590</span> * Start a minidfscluster.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @param servers How many DNs to start.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * @throws Exception<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return The mini dfs cluster created.<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> return startMiniDFSCluster(servers, null);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span> * Start a minidfscluster.<a name="line.601"></a>
+<span class="sourceLineNo">602</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * like HDFS block location verification.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * datanodes will have the same host name.<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * @param hosts hostnames DNs to run on.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> * @throws Exception<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @return The mini dfs cluster created.<a name="line.609"></a>
+<span class="sourceLineNo">610</span> */<a name="line.610"></a>
+<span class="sourceLineNo">611</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.611"></a>
+<span class="sourceLineNo">612</span> throws Exception {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> if ( hosts != null && hosts.length != 0) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } else {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return startMiniDFSCluster(1, null);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * Start a minidfscluster.<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Can only create one.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * @param servers How many DNs to start.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * @param hosts hostnames DNs to run on.<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * @throws Exception<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.626"></a>
+<span class="sourceLineNo">627</span> * @return The mini dfs cluster created.<a name="line.627"></a>
+<span class="sourceLineNo">628</span> */<a name="line.628"></a>
+<span class="sourceLineNo">629</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.629"></a>
+<span class="sourceLineNo">630</span> throws Exception {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private void setFs() throws IOException {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if(this.dfsCluster == null){<a name="line.635"></a>
+<span class="sourceLineNo">636</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.636"></a>
+<span class="sourceLineNo">637</span> return;<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span> // re-enable this check with dfs<a name="line.642"></a>
+<span class="sourceLineNo">643</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.643"></a>
+<span class="sourceLineNo">644</span> }<a name="line.644"></a>
+<span class="sourceLineNo">645</span><a name="line.645"></a>
+<span class="sourceLineNo">646</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.646"></a>
+<span class="sourceLineNo">647</span> throws Exception {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> createDirsAndSetProperties();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.651"></a>
+<span class="sourceLineNo">652</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.652"></a>
+<span class="sourceLineNo">653</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.653"></a>
+<span class="sourceLineNo">654</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.654"></a>
+<span class="sourceLineNo">655</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> TraceUtil.initTracer(conf);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.659"></a>
+<span class="sourceLineNo">660</span> true, null, racks, hosts, null);<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span> // Set this just-started cluster as our filesystem.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> setFs();<a name="line.663"></a>
+<span class="sourceLineNo">664</span><a name="line.664"></a>
+<span class="sourceLineNo">665</span> // Wait for the cluster to be totally up<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.dfsCluster.waitClusterUp();<a name="line.666"></a>
+<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">668</span> //reset the test directory for test file system<a name="line.668"></a>
+<span class="sourceLineNo">669</span> dataTestDirOnTestFS = null;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> String dataTestDir = getDataTestDir().toString();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.672"></a>
+<span class="sourceLineNo">673</span><a name="line.673"></a>
+<span class="sourceLineNo">674</span> return this.dfsCluster;<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> createDirsAndSetProperties();<a name="line.678"></a>
+<span class="sourceLineNo">679</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.679"></a>
+<span class="sourceLineNo">680</span> null, null, null);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> return dfsCluster;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> return this.dfsCluster;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> createDirsAndSetProperties();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.689"></a>
-<span class="sourceLineNo">690</span> null, null, null);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return dfsCluster;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> private void createDirsAndSetProperties() throws IOException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> setupClusterTestDir();<a name="line.696"></a>
-<span class="sourceLineNo">697</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.697"></a>
-<span class="sourceLineNo">698</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.698"></a>
-<span class="sourceLineNo">699</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.699"></a>
-<span class="sourceLineNo">700</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.700"></a>
-<span class="sourceLineNo">701</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.701"></a>
-<span class="sourceLineNo">702</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.702"></a>
-<span class="sourceLineNo">703</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.703"></a>
-<span class="sourceLineNo">704</span> enableShortCircuit();<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.706"></a>
-<span class="sourceLineNo">707</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.707"></a>
-<span class="sourceLineNo">708</span> new Path(root, "mapred-output-dir").toString());<a name="line.708"></a>
-<span class="sourceLineNo">709</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.709"></a>
-<span class="sourceLineNo">710</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.710"></a>
-<span class="sourceLineNo">711</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.711"></a>
-<span class="sourceLineNo">712</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.712"></a>
-<span class="sourceLineNo">713</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.713"></a>
-<span class="sourceLineNo">714</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> /**<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * This allows to specify this parameter on the command line.<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * If not set, default is true.<a name="line.721"></a>
-<span class="sourceLineNo">722</span> */<a name="line.722"></a>
-<span class="sourceLineNo">723</span> public boolean isReadShortCircuitOn(){<a name="line.723"></a>
-<span class="sourceLineNo">724</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.724"></a>
-<span class="sourceLineNo">725</span> String readOnProp = System.getProperty(propName);<a name="line.725"></a>
-<span class="sourceLineNo">726</span> if (readOnProp != null){<a name="line.726"></a>
-<span class="sourceLineNo">727</span> return Boolean.parseBoolean(readOnProp);<a name="line.727"></a>
-<span class="sourceLineNo">728</span> } else {<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return conf.getBoolean(propName, false);<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span><a name="line.732"></a>
-<span class="sourceLineNo">733</span> /** Enable the short circuit read, unless configured differently.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.734"></a>
-<span class="sourceLineNo">735</span> */<a name="line.735"></a>
-<span class="sourceLineNo">736</span> private void enableShortCircuit() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (isReadShortCircuitOn()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> String curUser = System.getProperty("user.name");<a name="line.738"></a>
-<span class="sourceLineNo">739</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> // read short circuit, for hdfs<a name="line.740"></a>
-<span class="sourceLineNo">741</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.741"></a>
-<span class="sourceLineNo">742</span> // read short circuit, for hbase<a name="line.742"></a>
-<span class="sourceLineNo">743</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.743"></a>
-<span class="sourceLineNo">744</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.744"></a>
-<span class="sourceLineNo">745</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> } else {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> LOG.info("read short circuit is OFF");<a name="line.747"></a>
-<span class="sourceLineNo">748</span> }<a name="line.748"></a>
-<span class="sourceLineNo">749</span> }<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> String path = getDataTestDir(relPath).toString();<a name="line.752"></a>
-<span class="sourceLineNo">753</span> System.setProperty(property, path);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> conf.set(property, path);<a name="line.754"></a>
-<span class="sourceLineNo">755</span> new File(path).mkdirs();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.756"></a>
-<span class="sourceLineNo">757</span> return path;<a name="line.757"></a>
-<span class="sourceLineNo">758</span> }<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * or does nothing.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * @throws IOException<a name="line.763"></a>
-<span class="sourceLineNo">764</span> */<a name="line.764"></a>
-<span class="sourceLineNo">765</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.dfsCluster != null) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.767"></a>
-<span class="sourceLineNo">768</span> this.dfsCluster.shutdown();<a name="line.768"></a>
-<span class="sourceLineNo">769</span> dfsCluster = null;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> dataTestDirOnTestFS = null;<a name="line.770"></a>
-<span class="sourceLineNo">771</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span> }<a name="line.773"></a>
-<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">684</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.684"></a>
+<span class="sourceLineNo">685</span> private void createDirsAndSetProperties() throws IOException {<a name="line.685"></a>
+<span class="sourceLineNo">686</span> setupClusterTestDir();<a name="line.686"></a>
+<span class="sourceLineNo">687</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.687"></a>
+<span class="sourceLineNo">688</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.689"></a>
+<span class="sourceLineNo">690</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.690"></a>
+<span class="sourceLineNo">691</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.691"></a>
+<span class="sourceLineNo">692</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.692"></a>
+<span class="sourceLineNo">693</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.693"></a>
+<span class="sourceLineNo">694</span> enableShortCircuit();<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.697"></a>
+<span class="sourceLineNo">698</span> new Path(root, "mapred-output-dir").toString());<a name="line.698"></a>
+<span class="sourceLineNo">699</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.699"></a>
+<span class="sourceLineNo">700</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.700"></a>
+<span class="sourceLineNo">701</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.701"></a>
+<span class="sourceLineNo">702</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.702"></a>
+<span class="sourceLineNo">703</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.703"></a>
+<span class="sourceLineNo">704</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.704"></a>
+<span class="sourceLineNo">705</span> }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span> /**<a name="line.708"></a>
+<span class="sourceLineNo">709</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.709"></a>
+<span class="sourceLineNo">710</span> * This allows to specify this parameter on the command line.<a name="line.710"></a>
+<span class="sourceLineNo">711</span> * If not set, default is true.<a name="line.711"></a>
+<span class="sourceLineNo">712</span> */<a name="line.712"></a>
+<span class="sourceLineNo">713</span> public boolean isReadShortCircuitOn(){<a name="line.713"></a>
+<span class="sourceLineNo">714</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.714"></a>
+<span class="sourceLineNo">715</span> String readOnProp = System.getProperty(propName);<a name="line.715"></a>
+<span class="sourceLineNo">716</span> if (readOnProp != null){<a name="line.716"></a>
+<span class="sourceLineNo">717</span> return Boolean.parseBoolean(readOnProp);<a name="line.717"></a>
+<span class="sourceLineNo">718</span> } else {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> return conf.getBoolean(propName, false);<a name="line.719"></a>
+<span class="sourceLineNo">720</span> }<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span><a name="line.722"></a>
+<span class="sourceLineNo">723</span> /** Enable the short circuit read, unless configured differently.<a name="line.723"></a>
+<span class="sourceLineNo">724</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.724"></a>
+<span class="sourceLineNo">725</span> */<a name="line.725"></a>
+<span class="sourceLineNo">726</span> private void enableShortCircuit() {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> if (isReadShortCircuitOn()) {<a name="line.727"></a>
+<span class="sourceLineNo">728</span> String curUser = System.getProperty("user.name");<a name="line.728"></a>
+<span class="sourceLineNo">729</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.729"></a>
+<span class="sourceLineNo">730</span> // read short circuit, for hdfs<a name="line.730"></a>
+<span class="sourceLineNo">731</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // read short circuit, for hbase<a name="line.732"></a>
+<span class="sourceLineNo">733</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.733"></a>
+<span class="sourceLineNo">734</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.734"></a>
+<span class="sourceLineNo">735</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.735"></a>
+<span class="sourceLineNo">736</span> } else {<a name="line.736"></a>
+<span class="sourceLineNo">737</span> LOG.info("read short circuit is OFF");<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> String path = getDataTestDir(relPath).toString();<a name="line.742"></a>
+<span class="sourceLineNo">743</span> System.setProperty(property, path);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> conf.set(property, path);<a name="line.744"></a>
+<span class="sourceLineNo">745</span> new File(path).mkdirs();<a name="line.745"></a>
+<span class="sourceLineNo">746</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.746"></a>
+<span class="sourceLineNo">747</span> return path;<a name="line.747"></a>
+<span class="sourceLineNo">748</span> }<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span> /**<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.751"></a>
+<span class="sourceLineNo">752</span> * or does nothing.<a name="line.752"></a>
+<span class="sourceLineNo">753</span> * @throws IOException<a name="line.753"></a>
+<span class="sourceLineNo">754</span> */<a name="line.754"></a>
+<span class="sourceLineNo">755</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (this.dfsCluster != null) {<a name="line.756"></a>
+<span class="sourceLineNo">757</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.757"></a>
+<span class="sourceLineNo">758</span> this.dfsCluster.shutdown();<a name="line.758"></a>
+<span class="sourceLineNo">759</span> dfsCluster = null;<a name="line.759"></a>
+<span class="sourceLineNo">760</span> dataTestDirOnTestFS = null;<a name="line.760"></a>
+<span class="sourceLineNo">761</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.761"></a>
+<span class="sourceLineNo">762</span> }<a name="line.762"></a>
+<span class="sourceLineNo">763</span> }<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> /**<a name="line.766"></a>
+<span class="sourceLineNo">767</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.767"></a>
+<span class="sourceLineNo">768</span> * @throws Exception<a name="line.768"></a>
+<span class="sourceLineNo">769</span> * @return Mini hbase cluster instance created.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.770"></a>
+<span class="sourceLineNo">771</span> */<a name="line.771"></a>
+<span class="sourceLineNo">772</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> return startMiniCluster(1, 1);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
<span class="sourceLineNo">775</span><a name="line.775"></a>
<span class="sourceLineNo">776</span> /**<a name="line.776"></a>
-<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.777"></a>
+<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.777"></a>
<span class="sourceLineNo">778</span> * @throws Exception<a name="line.778"></a>
<span class="sourceLineNo">779</span> * @return Mini hbase cluster instance created.<a name="line.779"></a>
<span class="sourceLineNo">780</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.780"></a>
<span class="sourceLineNo">781</span> */<a name="line.781"></a>
-<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> return startMiniCluster(1, 1);<a name="line.783"></a>
+<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.783"></a>
<span class="sourceLineNo">784</span> }<a name="line.784"></a>
<span class="sourceLineNo">785</span><a name="line.785"></a>
<span class="sourceLineNo">786</span> /**<a name="line.786"></a>
-<span class="sourceLineNo">787</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.787"></a>
-<span class="sourceLineNo">788</span> * @throws Exception<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @return Mini hbase cluster instance created.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span> /**<a name="line.796"></a>
-<span class="sourceLineNo">797</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.797"></a>
-<span class="sourceLineNo">798</span> * Set the <code>create</code> flag to create root or data directory path or not<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * (will overwrite if dir already exists)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> * @throws Exception<a name="line.800"></a>
-<span class="sourceLineNo">801</span> * @return Mini hbase cluster instance created.<a name="line.801"></a>
-<span class="sourceLineNo">802</span> * @see {@link
<TRUNCATED>
[07/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
index 869f6a1..3b08b86 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.html
@@ -341,2502 +341,2502 @@
<span class="sourceLineNo">333</span> // a hbase checksum verification failure will cause unit tests to fail<a name="line.333"></a>
<span class="sourceLineNo">334</span> ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.334"></a>
<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> // if conf is provided, prevent contention for ports if other hbase thread(s) are running<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (conf != null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.338"></a>
-<span class="sourceLineNo">339</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> LOG.debug("Config property {} changed to -1", HConstants.MASTER_INFO_PORT);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> LOG.debug("Config property {} changed to -1", HConstants.REGIONSERVER_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> // Save this for when setting default file:// breaks things<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // Every cluster is a local cluster until we start DFS<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Note that conf could be null, but this.conf will not be<a name="line.354"></a>
-<span class="sourceLineNo">355</span> String dataTestDir = getDataTestDir().toString();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.conf.set("fs.defaultFS","file:///");<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> /**<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @return a normal HBaseTestingUtility<a name="line.364"></a>
-<span class="sourceLineNo">365</span> */<a name="line.365"></a>
-<span class="sourceLineNo">366</span> @Deprecated<a name="line.366"></a>
-<span class="sourceLineNo">367</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return new HBaseTestingUtility();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return a normal HBaseTestingUtility<a name="line.373"></a>
-<span class="sourceLineNo">374</span> */<a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Deprecated<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return new HBaseTestingUtility(c);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> */<a name="line.382"></a>
-<span class="sourceLineNo">383</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> closeRegionAndWAL((HRegion)r);<a name="line.384"></a>
+<span class="sourceLineNo">336</span> // Save this for when setting default file:// breaks things<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Every cluster is a local cluster until we start DFS<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Note that conf could be null, but this.conf will not be<a name="line.340"></a>
+<span class="sourceLineNo">341</span> String dataTestDir = getDataTestDir().toString();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> this.conf.set("fs.defaultFS","file:///");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // If the value for random ports isn't set set it to true, thus making<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // tests opt-out for random port assignment<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.conf.setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS,<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true));<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> /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return a normal HBaseTestingUtility<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Deprecated<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return new HBaseTestingUtility();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @return a normal HBaseTestingUtility<a name="line.363"></a>
+<span class="sourceLineNo">364</span> */<a name="line.364"></a>
+<span class="sourceLineNo">365</span> @Deprecated<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> return new HBaseTestingUtility(c);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.371"></a>
+<span class="sourceLineNo">372</span> */<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> closeRegionAndWAL((HRegion)r);<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>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (r == null) return;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> r.close();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (r.getWAL() == null) return;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> r.getWAL().close();<a name="line.384"></a>
<span class="sourceLineNo">385</span> }<a name="line.385"></a>
<span class="sourceLineNo">386</span><a name="line.386"></a>
<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> */<a name="line.389"></a>
-<span class="sourceLineNo">390</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (r == null) return;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> r.close();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (r.getWAL() == null) return;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> r.getWAL().close();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * you use the returned Configuration since {@link Connection} instances<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * make a copy and use that. Do<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return Instance of Configuration.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> @Override<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public Configuration getConfiguration() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return super.getConfiguration();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> this.hbaseCluster = hbaseCluster;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * Give it a random name so can have many concurrent tests running if<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * System property, as it's what minidfscluster bases<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * instances -- another instance could grab the temporary<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * single instance only is how the minidfscluster works.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * We also create the underlying directory for<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.429"></a>
-<span class="sourceLineNo">430</span> *<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @return The calculated data test build directory, if newly-created.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected Path setupDataTestDir() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Path testPath = super.setupDataTestDir();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (null == testPath) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">388</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * you use the returned Configuration since {@link Connection} instances<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * make a copy and use that. Do<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.395"></a>
+<span class="sourceLineNo">396</span> * @return Instance of Configuration.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span> public Configuration getConfiguration() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return super.getConfiguration();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> this.hbaseCluster = hbaseCluster;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Give it a random name so can have many concurrent tests running if<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * System property, as it's what minidfscluster bases<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * instances -- another instance could grab the temporary<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * single instance only is how the minidfscluster works.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> *<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * We also create the underlying directory for<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.419"></a>
+<span class="sourceLineNo">420</span> *<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @return The calculated data test build directory, if newly-created.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> */<a name="line.422"></a>
+<span class="sourceLineNo">423</span> @Override<a name="line.423"></a>
+<span class="sourceLineNo">424</span> protected Path setupDataTestDir() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Path testPath = super.setupDataTestDir();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (null == testPath) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> createSubDirAndSystemProperty(<a name="line.430"></a>
+<span class="sourceLineNo">431</span> "hadoop.log.dir",<a name="line.431"></a>
+<span class="sourceLineNo">432</span> testPath, "hadoop-log-dir");<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // we want our own value to ensure uniqueness on the same machine<a name="line.435"></a>
+<span class="sourceLineNo">436</span> createSubDirAndSystemProperty(<a name="line.436"></a>
+<span class="sourceLineNo">437</span> "hadoop.tmp.dir",<a name="line.437"></a>
+<span class="sourceLineNo">438</span> testPath, "hadoop-tmp-dir");<a name="line.438"></a>
<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> createSubDirAndSystemProperty(<a name="line.440"></a>
-<span class="sourceLineNo">441</span> "hadoop.log.dir",<a name="line.441"></a>
-<span class="sourceLineNo">442</span> testPath, "hadoop-log-dir");<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // we want our own value to ensure uniqueness on the same machine<a name="line.445"></a>
-<span class="sourceLineNo">446</span> createSubDirAndSystemProperty(<a name="line.446"></a>
-<span class="sourceLineNo">447</span> "hadoop.tmp.dir",<a name="line.447"></a>
-<span class="sourceLineNo">448</span> testPath, "hadoop-tmp-dir");<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.450"></a>
-<span class="sourceLineNo">451</span> createSubDir(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> "mapreduce.cluster.local.dir",<a name="line.452"></a>
-<span class="sourceLineNo">453</span> testPath, "mapred-local-dir");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return testPath;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private void createSubDirAndSystemProperty(<a name="line.458"></a>
-<span class="sourceLineNo">459</span> String propertyName, Path parent, String subDirName){<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> String sysValue = System.getProperty(propertyName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (sysValue != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // There is already a value set. So we do nothing but hope<a name="line.464"></a>
-<span class="sourceLineNo">465</span> // that there will be no conflicts<a name="line.465"></a>
-<span class="sourceLineNo">466</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.466"></a>
-<span class="sourceLineNo">467</span> sysValue + " so I do NOT create it in " + parent);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> String confValue = conf.get(propertyName);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.warn(<a name="line.470"></a>
-<span class="sourceLineNo">471</span> propertyName + " property value differs in configuration and system: "+<a name="line.471"></a>
-<span class="sourceLineNo">472</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.472"></a>
-<span class="sourceLineNo">473</span> " Erasing configuration value by system value."<a name="line.473"></a>
-<span class="sourceLineNo">474</span> );<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> conf.set(propertyName, sysValue);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.478"></a>
-<span class="sourceLineNo">479</span> createSubDir(propertyName, parent, subDirName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * for the test filesystem by default<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @see #setupDataTestDirOnTestFS()<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @see #getTestFileSystem()<a name="line.488"></a>
+<span class="sourceLineNo">440</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.440"></a>
+<span class="sourceLineNo">441</span> createSubDir(<a name="line.441"></a>
+<span class="sourceLineNo">442</span> "mapreduce.cluster.local.dir",<a name="line.442"></a>
+<span class="sourceLineNo">443</span> testPath, "mapred-local-dir");<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> return testPath;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> private void createSubDirAndSystemProperty(<a name="line.448"></a>
+<span class="sourceLineNo">449</span> String propertyName, Path parent, String subDirName){<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> String sysValue = System.getProperty(propertyName);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (sysValue != null) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // There is already a value set. So we do nothing but hope<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // that there will be no conflicts<a name="line.455"></a>
+<span class="sourceLineNo">456</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.456"></a>
+<span class="sourceLineNo">457</span> sysValue + " so I do NOT create it in " + parent);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> String confValue = conf.get(propertyName);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.459"></a>
+<span class="sourceLineNo">460</span> LOG.warn(<a name="line.460"></a>
+<span class="sourceLineNo">461</span> propertyName + " property value differs in configuration and system: "+<a name="line.461"></a>
+<span class="sourceLineNo">462</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.462"></a>
+<span class="sourceLineNo">463</span> " Erasing configuration value by system value."<a name="line.463"></a>
+<span class="sourceLineNo">464</span> );<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> conf.set(propertyName, sysValue);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> } else {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.468"></a>
+<span class="sourceLineNo">469</span> createSubDir(propertyName, parent, subDirName);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * for the test filesystem by default<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @see #setupDataTestDirOnTestFS()<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @see #getTestFileSystem()<a name="line.478"></a>
+<span class="sourceLineNo">479</span> */<a name="line.479"></a>
+<span class="sourceLineNo">480</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> FileSystem fs = getTestFileSystem();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> /**<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return META table descriptor<a name="line.486"></a>
+<span class="sourceLineNo">487</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.488"></a>
<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> FileSystem fs = getTestFileSystem();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.492"></a>
+<span class="sourceLineNo">490</span> @Deprecated<a name="line.490"></a>
+<span class="sourceLineNo">491</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.492"></a>
<span class="sourceLineNo">493</span> }<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
<span class="sourceLineNo">496</span> * @return META table descriptor<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.498"></a>
-<span class="sourceLineNo">499</span> */<a name="line.499"></a>
-<span class="sourceLineNo">500</span> @Deprecated<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @return META table descriptor<a name="line.506"></a>
-<span class="sourceLineNo">507</span> */<a name="line.507"></a>
-<span class="sourceLineNo">508</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> try {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> } catch (IOException e) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * if the test relies on it.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * @return a unique path in the test filesystem<a name="line.520"></a>
-<span class="sourceLineNo">521</span> */<a name="line.521"></a>
-<span class="sourceLineNo">522</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (dataTestDirOnTestFS == null) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> setupDataTestDirOnTestFS();<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> return dataTestDirOnTestFS;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * if the test relies on it.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * @return a unique path in the test filesystem<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.535"></a>
-<span class="sourceLineNo">536</span> */<a name="line.536"></a>
-<span class="sourceLineNo">537</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * Sets up a path in test filesystem to be used by tests.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Creates a new directory if not already setup.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (dataTestDirOnTestFS != null) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.547"></a>
-<span class="sourceLineNo">548</span> + dataTestDirOnTestFS.toString());<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> /**<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.555"></a>
-<span class="sourceLineNo">556</span> */<a name="line.556"></a>
-<span class="sourceLineNo">557</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.558"></a>
-<span class="sourceLineNo">559</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.559"></a>
-<span class="sourceLineNo">560</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.560"></a>
-<span class="sourceLineNo">561</span> //the working directory, and create a unique sub dir there<a name="line.561"></a>
-<span class="sourceLineNo">562</span> FileSystem fs = getTestFileSystem();<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Path newDataTestDir;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> String randomStr = UUID.randomUUID().toString();<a name="line.564"></a>
-<span class="sourceLineNo">565</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } else {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path base = getBaseTestDirOnTestFS();<a name="line.570"></a>
-<span class="sourceLineNo">571</span> newDataTestDir = new Path(base, randomStr);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> return newDataTestDir;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * Cleans the test data directory on the test filesystem.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return True if we removed the test dirs<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * @throws IOException<a name="line.580"></a>
-<span class="sourceLineNo">581</span> */<a name="line.581"></a>
-<span class="sourceLineNo">582</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (ret)<a name="line.584"></a>
-<span class="sourceLineNo">585</span> dataTestDirOnTestFS = null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return ret;<a name="line.586"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> } catch (IOException e) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * if the test relies on it.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return a unique path in the test filesystem<a name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (dataTestDirOnTestFS == null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> setupDataTestDirOnTestFS();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> return dataTestDirOnTestFS;<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * if the test relies on it.<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return a unique path in the test filesystem<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.525"></a>
+<span class="sourceLineNo">526</span> */<a name="line.526"></a>
+<span class="sourceLineNo">527</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /**<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Sets up a path in test filesystem to be used by tests.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Creates a new directory if not already setup.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> if (dataTestDirOnTestFS != null) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.537"></a>
+<span class="sourceLineNo">538</span> + dataTestDirOnTestFS.toString());<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> /**<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> */<a name="line.546"></a>
+<span class="sourceLineNo">547</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.548"></a>
+<span class="sourceLineNo">549</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.549"></a>
+<span class="sourceLineNo">550</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.550"></a>
+<span class="sourceLineNo">551</span> //the working directory, and create a unique sub dir there<a name="line.551"></a>
+<span class="sourceLineNo">552</span> FileSystem fs = getTestFileSystem();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> Path newDataTestDir;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> String randomStr = UUID.randomUUID().toString();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> } else {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Path base = getBaseTestDirOnTestFS();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> newDataTestDir = new Path(base, randomStr);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return newDataTestDir;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Cleans the test data directory on the test filesystem.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * @return True if we removed the test dirs<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * @throws IOException<a name="line.570"></a>
+<span class="sourceLineNo">571</span> */<a name="line.571"></a>
+<span class="sourceLineNo">572</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (ret)<a name="line.574"></a>
+<span class="sourceLineNo">575</span> dataTestDirOnTestFS = null;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return ret;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> /**<a name="line.579"></a>
+<span class="sourceLineNo">580</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.580"></a>
+<span class="sourceLineNo">581</span> * @return True if we removed child<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * @throws IOException<a name="line.582"></a>
+<span class="sourceLineNo">583</span> */<a name="line.583"></a>
+<span class="sourceLineNo">584</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> return getTestFileSystem().delete(cpath, true);<a name="line.586"></a>
<span class="sourceLineNo">587</span> }<a name="line.587"></a>
<span class="sourceLineNo">588</span><a name="line.588"></a>
<span class="sourceLineNo">589</span> /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @return True if we removed child<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @throws IOException<a name="line.592"></a>
-<span class="sourceLineNo">593</span> */<a name="line.593"></a>
-<span class="sourceLineNo">594</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.595"></a>
-<span class="sourceLineNo">596</span> return getTestFileSystem().delete(cpath, true);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> /**<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * Start a minidfscluster.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @param servers How many DNs to start.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * @throws Exception<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @return The mini dfs cluster created.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> */<a name="line.605"></a>
-<span class="sourceLineNo">606</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.606"></a>
-<span class="sourceLineNo">607</span> return startMiniDFSCluster(servers, null);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * Start a minidfscluster.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * like HDFS block location verification.<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * datanodes will have the same host name.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param hosts hostnames DNs to run on.<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @throws Exception<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * @return The mini dfs cluster created.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> */<a name="line.620"></a>
-<span class="sourceLineNo">621</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.621"></a>
-<span class="sourceLineNo">622</span> throws Exception {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> if ( hosts != null && hosts.length != 0) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> } else {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> return startMiniDFSCluster(1, null);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span> * Start a minidfscluster.<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Can only create one.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * @param servers How many DNs to start.<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param hosts hostnames DNs to run on.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @throws Exception<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.636"></a>
-<span class="sourceLineNo">637</span> * @return The mini dfs cluster created.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> */<a name="line.638"></a>
-<span class="sourceLineNo">639</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.639"></a>
-<span class="sourceLineNo">640</span> throws Exception {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> private void setFs() throws IOException {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if(this.dfsCluster == null){<a name="line.645"></a>
-<span class="sourceLineNo">646</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> // re-enable this check with dfs<a name="line.652"></a>
-<span class="sourceLineNo">653</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.656"></a>
-<span class="sourceLineNo">657</span> throws Exception {<a name="line.657"></a>
-<span class="sourceLineNo">658</span> createDirsAndSetProperties();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.661"></a>
-<span class="sourceLineNo">662</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.662"></a>
-<span class="sourceLineNo">663</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.664"></a>
-<span class="sourceLineNo">665</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> TraceUtil.initTracer(conf);<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.669"></a>
-<span class="sourceLineNo">670</span> true, null, racks, hosts, null);<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> // Set this just-started cluster as our filesystem.<a name="line.672"></a>
-<span class="sourceLineNo">673</span> setFs();<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> // Wait for the cluster to be totally up<a name="line.675"></a>
-<span class="sourceLineNo">676</span> this.dfsCluster.waitClusterUp();<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //reset the test directory for test file system<a name="line.678"></a>
-<span class="sourceLineNo">679</span> dataTestDirOnTestFS = null;<a name="line.679"></a>
-<span class="sourceLineNo">680</span> String dataTestDir = getDataTestDir().toString();<a name="line.680"></a>
-<span class="sourceLineNo">681</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.681"></a>
-<span class="sourceLineNo">682</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.682"></a>
+<span class="sourceLineNo">590</span> * Start a minidfscluster.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @param servers How many DNs to start.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * @throws Exception<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return The mini dfs cluster created.<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> return startMiniDFSCluster(servers, null);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span> * Start a minidfscluster.<a name="line.601"></a>
+<span class="sourceLineNo">602</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * like HDFS block location verification.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * datanodes will have the same host name.<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * @param hosts hostnames DNs to run on.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> * @throws Exception<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @return The mini dfs cluster created.<a name="line.609"></a>
+<span class="sourceLineNo">610</span> */<a name="line.610"></a>
+<span class="sourceLineNo">611</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.611"></a>
+<span class="sourceLineNo">612</span> throws Exception {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> if ( hosts != null && hosts.length != 0) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } else {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return startMiniDFSCluster(1, null);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * Start a minidfscluster.<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Can only create one.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * @param servers How many DNs to start.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * @param hosts hostnames DNs to run on.<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * @throws Exception<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.626"></a>
+<span class="sourceLineNo">627</span> * @return The mini dfs cluster created.<a name="line.627"></a>
+<span class="sourceLineNo">628</span> */<a name="line.628"></a>
+<span class="sourceLineNo">629</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.629"></a>
+<span class="sourceLineNo">630</span> throws Exception {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private void setFs() throws IOException {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if(this.dfsCluster == null){<a name="line.635"></a>
+<span class="sourceLineNo">636</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.636"></a>
+<span class="sourceLineNo">637</span> return;<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span> // re-enable this check with dfs<a name="line.642"></a>
+<span class="sourceLineNo">643</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.643"></a>
+<span class="sourceLineNo">644</span> }<a name="line.644"></a>
+<span class="sourceLineNo">645</span><a name="line.645"></a>
+<span class="sourceLineNo">646</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.646"></a>
+<span class="sourceLineNo">647</span> throws Exception {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> createDirsAndSetProperties();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.651"></a>
+<span class="sourceLineNo">652</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.652"></a>
+<span class="sourceLineNo">653</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.653"></a>
+<span class="sourceLineNo">654</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.654"></a>
+<span class="sourceLineNo">655</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> TraceUtil.initTracer(conf);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.659"></a>
+<span class="sourceLineNo">660</span> true, null, racks, hosts, null);<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span> // Set this just-started cluster as our filesystem.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> setFs();<a name="line.663"></a>
+<span class="sourceLineNo">664</span><a name="line.664"></a>
+<span class="sourceLineNo">665</span> // Wait for the cluster to be totally up<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.dfsCluster.waitClusterUp();<a name="line.666"></a>
+<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">668</span> //reset the test directory for test file system<a name="line.668"></a>
+<span class="sourceLineNo">669</span> dataTestDirOnTestFS = null;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> String dataTestDir = getDataTestDir().toString();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.672"></a>
+<span class="sourceLineNo">673</span><a name="line.673"></a>
+<span class="sourceLineNo">674</span> return this.dfsCluster;<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> createDirsAndSetProperties();<a name="line.678"></a>
+<span class="sourceLineNo">679</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.679"></a>
+<span class="sourceLineNo">680</span> null, null, null);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> return dfsCluster;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> return this.dfsCluster;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> createDirsAndSetProperties();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.689"></a>
-<span class="sourceLineNo">690</span> null, null, null);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return dfsCluster;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> private void createDirsAndSetProperties() throws IOException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> setupClusterTestDir();<a name="line.696"></a>
-<span class="sourceLineNo">697</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.697"></a>
-<span class="sourceLineNo">698</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.698"></a>
-<span class="sourceLineNo">699</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.699"></a>
-<span class="sourceLineNo">700</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.700"></a>
-<span class="sourceLineNo">701</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.701"></a>
-<span class="sourceLineNo">702</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.702"></a>
-<span class="sourceLineNo">703</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.703"></a>
-<span class="sourceLineNo">704</span> enableShortCircuit();<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.706"></a>
-<span class="sourceLineNo">707</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.707"></a>
-<span class="sourceLineNo">708</span> new Path(root, "mapred-output-dir").toString());<a name="line.708"></a>
-<span class="sourceLineNo">709</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.709"></a>
-<span class="sourceLineNo">710</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.710"></a>
-<span class="sourceLineNo">711</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.711"></a>
-<span class="sourceLineNo">712</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.712"></a>
-<span class="sourceLineNo">713</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.713"></a>
-<span class="sourceLineNo">714</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> /**<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * This allows to specify this parameter on the command line.<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * If not set, default is true.<a name="line.721"></a>
-<span class="sourceLineNo">722</span> */<a name="line.722"></a>
-<span class="sourceLineNo">723</span> public boolean isReadShortCircuitOn(){<a name="line.723"></a>
-<span class="sourceLineNo">724</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.724"></a>
-<span class="sourceLineNo">725</span> String readOnProp = System.getProperty(propName);<a name="line.725"></a>
-<span class="sourceLineNo">726</span> if (readOnProp != null){<a name="line.726"></a>
-<span class="sourceLineNo">727</span> return Boolean.parseBoolean(readOnProp);<a name="line.727"></a>
-<span class="sourceLineNo">728</span> } else {<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return conf.getBoolean(propName, false);<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span><a name="line.732"></a>
-<span class="sourceLineNo">733</span> /** Enable the short circuit read, unless configured differently.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.734"></a>
-<span class="sourceLineNo">735</span> */<a name="line.735"></a>
-<span class="sourceLineNo">736</span> private void enableShortCircuit() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (isReadShortCircuitOn()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> String curUser = System.getProperty("user.name");<a name="line.738"></a>
-<span class="sourceLineNo">739</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> // read short circuit, for hdfs<a name="line.740"></a>
-<span class="sourceLineNo">741</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.741"></a>
-<span class="sourceLineNo">742</span> // read short circuit, for hbase<a name="line.742"></a>
-<span class="sourceLineNo">743</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.743"></a>
-<span class="sourceLineNo">744</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.744"></a>
-<span class="sourceLineNo">745</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> } else {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> LOG.info("read short circuit is OFF");<a name="line.747"></a>
-<span class="sourceLineNo">748</span> }<a name="line.748"></a>
-<span class="sourceLineNo">749</span> }<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> String path = getDataTestDir(relPath).toString();<a name="line.752"></a>
-<span class="sourceLineNo">753</span> System.setProperty(property, path);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> conf.set(property, path);<a name="line.754"></a>
-<span class="sourceLineNo">755</span> new File(path).mkdirs();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.756"></a>
-<span class="sourceLineNo">757</span> return path;<a name="line.757"></a>
-<span class="sourceLineNo">758</span> }<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * or does nothing.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * @throws IOException<a name="line.763"></a>
-<span class="sourceLineNo">764</span> */<a name="line.764"></a>
-<span class="sourceLineNo">765</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.dfsCluster != null) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.767"></a>
-<span class="sourceLineNo">768</span> this.dfsCluster.shutdown();<a name="line.768"></a>
-<span class="sourceLineNo">769</span> dfsCluster = null;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> dataTestDirOnTestFS = null;<a name="line.770"></a>
-<span class="sourceLineNo">771</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span> }<a name="line.773"></a>
-<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">684</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.684"></a>
+<span class="sourceLineNo">685</span> private void createDirsAndSetProperties() throws IOException {<a name="line.685"></a>
+<span class="sourceLineNo">686</span> setupClusterTestDir();<a name="line.686"></a>
+<span class="sourceLineNo">687</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.687"></a>
+<span class="sourceLineNo">688</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.689"></a>
+<span class="sourceLineNo">690</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.690"></a>
+<span class="sourceLineNo">691</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.691"></a>
+<span class="sourceLineNo">692</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.692"></a>
+<span class="sourceLineNo">693</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.693"></a>
+<span class="sourceLineNo">694</span> enableShortCircuit();<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.697"></a>
+<span class="sourceLineNo">698</span> new Path(root, "mapred-output-dir").toString());<a name="line.698"></a>
+<span class="sourceLineNo">699</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.699"></a>
+<span class="sourceLineNo">700</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.700"></a>
+<span class="sourceLineNo">701</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.701"></a>
+<span class="sourceLineNo">702</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.702"></a>
+<span class="sourceLineNo">703</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.703"></a>
+<span class="sourceLineNo">704</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.704"></a>
+<span class="sourceLineNo">705</span> }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span> /**<a name="line.708"></a>
+<span class="sourceLineNo">709</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.709"></a>
+<span class="sourceLineNo">710</span> * This allows to specify this parameter on the command line.<a name="line.710"></a>
+<span class="sourceLineNo">711</span> * If not set, default is true.<a name="line.711"></a>
+<span class="sourceLineNo">712</span> */<a name="line.712"></a>
+<span class="sourceLineNo">713</span> public boolean isReadShortCircuitOn(){<a name="line.713"></a>
+<span class="sourceLineNo">714</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.714"></a>
+<span class="sourceLineNo">715</span> String readOnProp = System.getProperty(propName);<a name="line.715"></a>
+<span class="sourceLineNo">716</span> if (readOnProp != null){<a name="line.716"></a>
+<span class="sourceLineNo">717</span> return Boolean.parseBoolean(readOnProp);<a name="line.717"></a>
+<span class="sourceLineNo">718</span> } else {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> return conf.getBoolean(propName, false);<a name="line.719"></a>
+<span class="sourceLineNo">720</span> }<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span><a name="line.722"></a>
+<span class="sourceLineNo">723</span> /** Enable the short circuit read, unless configured differently.<a name="line.723"></a>
+<span class="sourceLineNo">724</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.724"></a>
+<span class="sourceLineNo">725</span> */<a name="line.725"></a>
+<span class="sourceLineNo">726</span> private void enableShortCircuit() {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> if (isReadShortCircuitOn()) {<a name="line.727"></a>
+<span class="sourceLineNo">728</span> String curUser = System.getProperty("user.name");<a name="line.728"></a>
+<span class="sourceLineNo">729</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.729"></a>
+<span class="sourceLineNo">730</span> // read short circuit, for hdfs<a name="line.730"></a>
+<span class="sourceLineNo">731</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // read short circuit, for hbase<a name="line.732"></a>
+<span class="sourceLineNo">733</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.733"></a>
+<span class="sourceLineNo">734</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.734"></a>
+<span class="sourceLineNo">735</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.735"></a>
+<span class="sourceLineNo">736</span> } else {<a name="line.736"></a>
+<span class="sourceLineNo">737</span> LOG.info("read short circuit is OFF");<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> String path = getDataTestDir(relPath).toString();<a name="line.742"></a>
+<span class="sourceLineNo">743</span> System.setProperty(property, path);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> conf.set(property, path);<a name="line.744"></a>
+<span class="sourceLineNo">745</span> new File(path).mkdirs();<a name="line.745"></a>
+<span class="sourceLineNo">746</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.746"></a>
+<span class="sourceLineNo">747</span> return path;<a name="line.747"></a>
+<span class="sourceLineNo">748</span> }<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span> /**<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.751"></a>
+<span class="sourceLineNo">752</span> * or does nothing.<a name="line.752"></a>
+<span class="sourceLineNo">753</span> * @throws IOException<a name="line.753"></a>
+<span class="sourceLineNo">754</span> */<a name="line.754"></a>
+<span class="sourceLineNo">755</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (this.dfsCluster != null) {<a name="line.756"></a>
+<span class="sourceLineNo">757</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.757"></a>
+<span class="sourceLineNo">758</span> this.dfsCluster.shutdown();<a name="line.758"></a>
+<span class="sourceLineNo">759</span> dfsCluster = null;<a name="line.759"></a>
+<span class="sourceLineNo">760</span> dataTestDirOnTestFS = null;<a name="line.760"></a>
+<span class="sourceLineNo">761</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.761"></a>
+<span class="sourceLineNo">762</span> }<a name="line.762"></a>
+<span class="sourceLineNo">763</span> }<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> /**<a name="line.766"></a>
+<span class="sourceLineNo">767</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.767"></a>
+<span class="sourceLineNo">768</span> * @throws Exception<a name="line.768"></a>
+<span class="sourceLineNo">769</span> * @return Mini hbase cluster instance created.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.770"></a>
+<span class="sourceLineNo">771</span> */<a name="line.771"></a>
+<span class="sourceLineNo">772</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> return startMiniCluster(1, 1);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
<span class="sourceLineNo">775</span><a name="line.775"></a>
<span class="sourceLineNo">776</span> /**<a name="line.776"></a>
-<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.777"></a>
+<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.777"></a>
<span class="sourceLineNo">778</span> * @throws Exception<a name="line.778"></a>
<span class="sourceLineNo">779</span> * @return Mini hbase cluster instance created.<a name="line.779"></a>
<span class="sourceLineNo">780</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.780"></a>
<span class="sourceLineNo">781</span> */<a name="line.781"></a>
-<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> return startMiniCluster(1, 1);<a name="line.783"></a>
+<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.783"></a>
<span class="sourceLineNo">784</span> }<a name="line.784"></a>
<span class="sourceLineNo">785</span><a name="line.785"></a>
<span class="sourceLineNo">786</span> /**<a name="line.786"></a>
-<span class="sourceLineNo">787</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.787"></a>
-<span class="sourceLineNo">788</span> * @throws Exception<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @return Mini hbase cluster instance created.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span> /**<a name="line.796"></a>
-<span class="sourceLineNo">797</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.797"></a>
-<span class="sourceLineNo">798</span> * Set the <code>create</code> flag to create root or data directory path or not<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * (will overwrite if dir already exists)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> * @throws Exception<a name="line.800"></a>
-<span class="sourceLineNo">801</span> * @return Mini hbase cluster instance created.<a name="line.801"></a>
-<span class="sourceLineNo">802</span> * @see {@link #shut
<TRUNCATED>
[04/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
index c9fbc98..af2e5b1 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
@@ -116,811 +116,805 @@
<span class="sourceLineNo">108</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.108"></a>
<span class="sourceLineNo">109</span> throws IOException, InterruptedException {<a name="line.109"></a>
<span class="sourceLineNo">110</span> super(conf);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> conf.set(HConstants.MASTER_INFO_PORT, "0");<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> // Hadoop 2<a name="line.118"></a>
-<span class="sourceLineNo">119</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> this.initialClusterStatus = getClusterStatus();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> public Configuration getConfiguration() {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return this.conf;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * the FileSystem system exit hook does.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> */<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> private Thread shutdownThread = null;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> private User user = null;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.143"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> // Hadoop 2<a name="line.112"></a>
+<span class="sourceLineNo">113</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> this.initialClusterStatus = getClusterStatus();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> public Configuration getConfiguration() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> return this.conf;<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> /**<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * the FileSystem system exit hook does.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> private Thread shutdownThread = null;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> private User user = null;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> */<a name="line.136"></a>
+<span class="sourceLineNo">137</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throws IOException, InterruptedException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> super(conf);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> this.user = User.getCurrent();<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> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.145"></a>
-<span class="sourceLineNo">146</span> throws IOException, InterruptedException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> super(conf);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.user = User.getCurrent();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /*<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param c<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @param currentfs We return this if we did not make a new one.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @throws IOException<a name="line.156"></a>
-<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span> protected void handleReportForDutyResponse(<a name="line.160"></a>
-<span class="sourceLineNo">161</span> final RegionServerStartupResponse c) throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> super.handleReportForDutyResponse(c);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // Run this thread to shutdown our filesystem on way out.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<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> @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span> public void run() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public Object run() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> runRegionServer();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return null;<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> } catch (Throwable t) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> LOG.error("Exception in run", t);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> } finally {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Run this on the way out.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (this.shutdownThread != null) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.shutdownThread.start();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> private void runRegionServer() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> super.run();<a name="line.189"></a>
+<span class="sourceLineNo">145</span> /*<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @param c<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @param currentfs We return this if we did not make a new one.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @throws IOException<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
+<span class="sourceLineNo">154</span> protected void handleReportForDutyResponse(<a name="line.154"></a>
+<span class="sourceLineNo">155</span> final RegionServerStartupResponse c) throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> super.handleReportForDutyResponse(c);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> // Run this thread to shutdown our filesystem on way out.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public void run() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public Object run() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> runRegionServer();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return null;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> });<a name="line.170"></a>
+<span class="sourceLineNo">171</span> } catch (Throwable t) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.error("Exception in run", t);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> } finally {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Run this on the way out.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (this.shutdownThread != null) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> this.shutdownThread.start();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void runRegionServer() {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> super.run();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span> protected void kill() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> killedServers.add(getServerName());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> super.kill();<a name="line.189"></a>
<span class="sourceLineNo">190</span> }<a name="line.190"></a>
<span class="sourceLineNo">191</span><a name="line.191"></a>
<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> protected void kill() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> killedServers.add(getServerName());<a name="line.194"></a>
-<span class="sourceLineNo">195</span> super.kill();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public void abort(final String reason, final Throwable cause) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public Object run() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> abortRegionServer(reason, cause);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return null;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> });<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> super.abort(reason, cause);<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">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * Alternate shutdown hook.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> private final FileSystem fs;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> super("Shutdown of " + fs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.fs = fs;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public void run() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> try {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.fs.close();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> } catch (NullPointerException npe) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.230"></a>
-<span class="sourceLineNo">231</span> } catch (IOException e) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.warn("Running hook", e);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Class<? extends HMaster> masterClass,<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.239"></a>
-<span class="sourceLineNo">240</span> throws IOException, InterruptedException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (masterClass == null){<a name="line.242"></a>
-<span class="sourceLineNo">243</span> masterClass = HMaster.class;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (regionserverClass == null){<a name="line.245"></a>
-<span class="sourceLineNo">246</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> // start up a LocalHBaseCluster<a name="line.249"></a>
-<span class="sourceLineNo">250</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.250"></a>
-<span class="sourceLineNo">251</span> masterClass, regionserverClass);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> // manually add the regionservers as other users<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (rsPorts != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ".hfs."+index++);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> hbaseCluster.startup();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> shutdown();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> throw e;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> } catch (Throwable t) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> LOG.error("Error starting cluster", t);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> shutdown();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new IOException("Shutting down", t);<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>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> this.startRegionServer();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> LOG.info("Killing " + server.toString());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> @Override<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public boolean isKilledRS(ServerName serverName) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
+<span class="sourceLineNo">193</span> public void abort(final String reason, final Throwable cause) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public Object run() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> abortRegionServer(reason, cause);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return null;<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><a name="line.202"></a>
+<span class="sourceLineNo">203</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> super.abort(reason, cause);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Alternate shutdown hook.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> private final FileSystem fs;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> super("Shutdown of " + fs);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.fs = fs;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public void run() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.fs.close();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } catch (NullPointerException npe) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.224"></a>
+<span class="sourceLineNo">225</span> } catch (IOException e) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> LOG.warn("Running hook", e);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.231"></a>
+<span class="sourceLineNo">232</span> Class<? extends HMaster> masterClass,<a name="line.232"></a>
+<span class="sourceLineNo">233</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.233"></a>
+<span class="sourceLineNo">234</span> throws IOException, InterruptedException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (masterClass == null){<a name="line.236"></a>
+<span class="sourceLineNo">237</span> masterClass = HMaster.class;<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span> if (regionserverClass == null){<a name="line.239"></a>
+<span class="sourceLineNo">240</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // start up a LocalHBaseCluster<a name="line.243"></a>
+<span class="sourceLineNo">244</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.244"></a>
+<span class="sourceLineNo">245</span> masterClass, regionserverClass);<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> // manually add the regionservers as other users<a name="line.247"></a>
+<span class="sourceLineNo">248</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (rsPorts != null) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.253"></a>
+<span class="sourceLineNo">254</span> ".hfs."+index++);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> hbaseCluster.startup();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> } catch (IOException e) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> shutdown();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throw e;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } catch (Throwable t) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> LOG.error("Error starting cluster", t);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> shutdown();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException("Shutting down", t);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> this.startRegionServer();<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> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("Killing " + server.toString());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> } else {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public boolean isKilledRS(ServerName serverName) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> //ignore timeout for now<a name="line.297"></a>
+<span class="sourceLineNo">298</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
<span class="sourceLineNo">299</span> }<a name="line.299"></a>
<span class="sourceLineNo">300</span><a name="line.300"></a>
<span class="sourceLineNo">301</span> @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> //ignore timeout for now<a name="line.303"></a>
-<span class="sourceLineNo">304</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> @Override<a name="line.307"></a>
-<span class="sourceLineNo">308</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> @Override<a name="line.322"></a>
-<span class="sourceLineNo">323</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> @Override<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> @Override<a name="line.332"></a>
-<span class="sourceLineNo">333</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> @Override<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Override<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<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> @Override<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> @Override<a name="line.357"></a>
-<span class="sourceLineNo">358</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.startMaster();<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> @Override<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> abortMaster(getMasterIndex(serverName));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> @Override<a name="line.367"></a>
-<span class="sourceLineNo">368</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> stopMaster(getMasterIndex(serverName));<a name="line.369"></a>
+<span class="sourceLineNo">302</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span> @Override<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> @Override<a name="line.336"></a>
+<span class="sourceLineNo">337</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> @Override<a name="line.341"></a>
+<span class="sourceLineNo">342</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> @Override<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> this.startMaster();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Override<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> abortMaster(getMasterIndex(serverName));<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> @Override<a name="line.361"></a>
+<span class="sourceLineNo">362</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> stopMaster(getMasterIndex(serverName));<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> @Override<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> //ignore timeout for now<a name="line.368"></a>
+<span class="sourceLineNo">369</span> waitOnMaster(getMasterIndex(serverName));<a name="line.369"></a>
<span class="sourceLineNo">370</span> }<a name="line.370"></a>
<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> @Override<a name="line.372"></a>
-<span class="sourceLineNo">373</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> //ignore timeout for now<a name="line.374"></a>
-<span class="sourceLineNo">375</span> waitOnMaster(getMasterIndex(serverName));<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">378</span> /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * Starts a region server thread running<a name="line.379"></a>
-<span class="sourceLineNo">380</span> *<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @throws IOException<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return New RegionServerThread<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throws IOException {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> User rsUser =<a name="line.387"></a>
-<span class="sourceLineNo">388</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> try {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> t = hbaseCluster.addRegionServer(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> t.start();<a name="line.393"></a>
-<span class="sourceLineNo">394</span> t.waitForServerOnline();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } catch (InterruptedException ie) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return t;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * when it can't start a region server or when the region server is not processed by master<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * within the timeout.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return New RegionServerThread<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.408"></a>
-<span class="sourceLineNo">409</span> throws IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> long start = System.currentTimeMillis();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return t;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Threads.sleep(100);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (t.getRegionServer().isOnline()) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.423"></a>
-<span class="sourceLineNo">424</span> } else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param serverNumber Used as index into a list.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public String abortRegionServer(int serverNumber) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> LOG.info("Aborting " + server.toString());<a name="line.435"></a>
-<span class="sourceLineNo">436</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return server.toString();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Shut down the specified region server cleanly<a name="line.441"></a>
-<span class="sourceLineNo">442</span> *<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * @param serverNumber Used as index into a list.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * @return the region server that was stopped<a name="line.444"></a>
-<span class="sourceLineNo">445</span> */<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> return stopRegionServer(serverNumber, true);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Shut down the specified region server cleanly<a name="line.451"></a>
-<span class="sourceLineNo">452</span> *<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * @param serverNumber Used as index into a list.<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * you are running multiple regionservers in a test and you shut down one<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * before end of the test.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @return the region server that was stopped<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.460"></a>
-<span class="sourceLineNo">461</span> final boolean shutdownFS) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> JVMClusterUtil.RegionServerThread server =<a name="line.462"></a>
-<span class="sourceLineNo">463</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> LOG.info("Stopping " + server.toString());<a name="line.464"></a>
-<span class="sourceLineNo">465</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return server;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * of running threads.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param serverNumber<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @return Name of region server that just went down.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> */<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * Starts a master thread running<a name="line.481"></a>
-<span class="sourceLineNo">482</span> *<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @return New RegionServerThread<a name="line.483"></a>
-<span class="sourceLineNo">484</span> */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> User user =<a name="line.487"></a>
-<span class="sourceLineNo">488</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> JVMClusterUtil.MasterThread t = null;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> try {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> t.start();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> } catch (InterruptedException ie) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return t;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> /**<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * Returns the current active master, if available.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @return the active HMaster, null if none is active.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> */<a name="line.503"></a>
-<span class="sourceLineNo">504</span> @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> /**<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * Returns the current active master, if available.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @return the active HMaster, null if none is active.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> */<a name="line.512"></a>
-<span class="sourceLineNo">513</span> public HMaster getMaster() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return this.hbaseCluster.getActiveMaster();<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> /**<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Returns the current active master thread, if available.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * @return the active MasterThread, null if none is active.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> */<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public MasterThread getMasterThread() {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (mt.getMaster().isActiveMaster()) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> return mt;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns the master at the specified index, if available.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * @return the active HMaster, null if none is active.<a name="line.532"></a>
-<span class="sourceLineNo">533</span> */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public HMaster getMaster(final int serverNumber) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> return this.hbaseCluster.getMaster(serverNumber);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * Cause a master to exit without shutting down entire cluster.<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param serverNumber Used as index into a list.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> */<a name="line.541"></a>
-<span class="sourceLineNo">542</span> public String abortMaster(int serverNumber) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> HMaster server = getMaster(serverNumber);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Aborting " + server.toString());<a name="line.544"></a>
-<span class="sourceLineNo">545</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.545"></a>
-<span class="sourceLineNo">546</span> return server.toString();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Shut down the specified master cleanly<a name="line.550"></a>
-<span class="sourceLineNo">551</span> *<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * @param serverNumber Used as index into a list.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * @return the region server that was stopped<a name="line.553"></a>
-<span class="sourceLineNo">554</span> */<a name="line.554"></a>
-<span class="sourceLineNo">555</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> return stopMaster(serverNumber, true);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * Shut down the specified master cleanly<a name="line.560"></a>
-<span class="sourceLineNo">561</span> *<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * @param serverNumber Used as index into a list.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * master's shutdown. Usually we do but you do not want to do this if<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * you are running multiple master in a test and you shut down one<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * before end of the test.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @return the master that was stopped<a name="line.567"></a>
-<span class="sourceLineNo">568</span> */<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber,<a name="line.569"></a>
-<span class="sourceLineNo">570</span> final boolean shutdownFS) {<a name="line.570"></a>
-<span class="sourceLineNo">571</span> JVMClusterUtil.MasterThread server =<a name="line.571"></a>
-<span class="sourceLineNo">572</span> hbaseCluster.getMasters().get(serverNumber);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> LOG.info("Stopping " + server.toString());<a name="line.573"></a>
-<span class="sourceLineNo">574</span> server.getMaster().stop("Stopping master " + serverNumber);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> return server;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * Wait for the specified master to stop. Removes this thread from list<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * of running threads.<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * @param serverNumber<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * @return Name of master that just went down.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> */<a name="line.583"></a>
-<span class="sourceLineNo">584</span> public String waitOnMaster(final int serverNumber) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return this.hbaseCluster.waitOnMaster(serverNumber);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span> /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * Blocks until there is an active master and that master has completed<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * initialization.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> *<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @return true if an active master becomes available. false if there are no<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * masters left.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @throws InterruptedException<a name="line.594"></a>
-<span class="sourceLineNo">595</span> */<a name="line.595"></a>
-<span class="sourceLineNo">596</span> @Override<a name="line.596"></a>
-<span class="sourceLineNo">597</span> public boolean waitForActiveAndReadyMaster(long timeout) throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> List<JVMClusterUtil.MasterThread> mts;<a name="line.598"></a>
-<span class="sourceLineNo">599</span> long start = System.currentTimeMillis();<a name="line.599"></a>
-<span class="sourceLineNo">600</span> while (!(mts = getMasterThreads()).isEmpty()<a name="line.600"></a>
-<span class="sourceLineNo">601</span> && (System.currentTimeMillis() - start) < timeout) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (JVMClusterUtil.MasterThread mt : mts) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (mt.getMaster().isActiveMaster() && mt.getMaster().isInitialized()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return true;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span> Threads.sleep(100);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> }<a name="line.609"></a>
-<span class="sourceLineNo">610</span> return false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * @return List of master threads.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> */<a name="line.615"></a>
-<span class="sourceLineNo">616</span> public List<JVMClusterUtil.MasterThread> getMasterThreads() {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> return this.hbaseCluster.getMasters();<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * @return List of live master threads (skips the aborted and the killed)<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> public List<JVMClusterUtil.MasterThread> getLiveMasterThreads() {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return this.hbaseCluster.getLiveMasters();<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> /**<a name="line.627"></a>
-<span class="sourceLineNo">628</span> * Wait for Mini HBase Cluster to shut down.<a name="line.628"></a>
-<span class="sourceLineNo">629</span> */<a name="line.629"></a>
-<span class="sourceLineNo">630</span> public void join() {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> this.hbaseCluster.join();<a name="line.631"></a>
-<span class="sourceLineNo">632</span> }<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span> /**<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * Shut down the mini HBase cluster<a name="line.635"></a>
-<span class="sourceLineNo">636</span> */<a name="line.636"></a>
-<span class="sourceLineNo">637</span> @Override<a name="line.637"></a>
-<span class="sourceLineNo">638</span> public void shutdown() throws IOException {<a name="line.638"></a>
-<span class="sourceLineNo">639</span> if (this.hbaseCluster != null) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span> this.hbaseCluster.shutdown();<a name="line.640"></a>
-<span class="sourceLineNo">641</span> }<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> @Override<a name="line.644"></a>
-<span class="sourceLineNo">645</span> public void close() throws IOException {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> /**<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0<a name="line.649"></a>
-<span class="sourceLineNo">650</span> * Use {@link #getClusterMetrics()} instead.<a name="line.650"></a>
-<span class="sourceLineNo">651</span> */<a name="line.651"></a>
-<span class="sourceLineNo">652</span> @Deprecated<a name="line.652"></a>
-<span class="sourceLineNo">653</span> public ClusterStatus getClusterStatus() throws IOException {<a name="line.653"></a>
+<span class="sourceLineNo">372</span> /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * Starts a region server thread running<a name="line.373"></a>
+<span class="sourceLineNo">374</span> *<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * @throws IOException<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * @return New RegionServerThread<a name="line.376"></a>
+<span class="sourceLineNo">377</span> */<a name="line.377"></a>
+<span class="sourceLineNo">378</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.378"></a>
+<span class="sourceLineNo">379</span> throws IOException {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> User rsUser =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> try {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> t = hbaseCluster.addRegionServer(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> t.start();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> t.waitForServerOnline();<a name="line.388"></a>
+<span class="sourceLineNo">389</span> } catch (InterruptedException ie) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span> return t;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.396"></a>
+<span class="sourceLineNo">397</span> * when it can't start a region server or when the region server is not processed by master<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * within the timeout.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> *<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * @return New RegionServerThread<a name="line.400"></a>
+<span class="sourceLineNo">401</span> */<a name="line.401"></a>
+<span class="sourceLineNo">402</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throws IOException {<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> long start = System.currentTimeMillis();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return t;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span> Threads.sleep(100);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (t.getRegionServer().isOnline()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @param serverNumber Used as index into a list.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public String abortRegionServer(int serverNumber) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> LOG.info("Aborting " + server.toString());<a name="line.429"></a>
+<span class="sourceLineNo">430</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return server.toString();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Shut down the specified region server cleanly<a name="line.435"></a>
+<span class="sourceLineNo">436</span> *<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * @param serverNumber Used as index into a list.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * @return the region server that was stopped<a name="line.438"></a>
+<span class="sourceLineNo">439</span> */<a name="line.439"></a>
+<span class="sourceLineNo">440</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> return stopRegionServer(serverNumber, true);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> /**<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Shut down the specified region server cleanly<a name="line.445"></a>
+<span class="sourceLineNo">446</span> *<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * @param serverNumber Used as index into a list.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * you are running multiple regionservers in a test and you shut down one<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * before end of the test.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * @return the region server that was stopped<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.454"></a>
+<span class="sourceLineNo">455</span> final boolean shutdownFS) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> JVMClusterUtil.RegionServerThread server =<a name="line.456"></a>
+<span class="sourceLineNo">457</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> LOG.info("Stopping " + server.toString());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return server;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> /**<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * of running threads.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * @param serverNumber<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * @return Name of region server that just went down.<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * Starts a master thread running<a name="line.475"></a>
+<span class="sourceLineNo">476</span> *<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @return New RegionServerThread<a name="line.477"></a>
+<span class="sourceLineNo">478</span> */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> User user =<a name="line.481"></a>
+<span class="sourceLineNo">482</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span> JVMClusterUtil.MasterThread t = null;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> try {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> t.start();<a name="line.487"></a>
+<span class="sourceLineNo">488</span> } catch (InterruptedException ie) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return t;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * Returns the current active master, if available.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * @return the active HMaster, null if none is active.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> @Override<a name="line.498"></a>
+<span class="sourceLineNo">499</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> /**<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Returns the current active master, if available.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> * @return the active HMaster, null if none is active.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> */<a name="line.506"></a>
+<span class="sourceLineNo">507</span> public HMaster getMaster() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return this.hbaseCluster.getActiveMaster();<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Returns the current active master thread, if available.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> * @return the active MasterThread, null if none is active.<a name="line.513"></a>
+<span class="sourceLineNo">514</span> */<a name="line.514"></a>
+<span class="sourceLineNo">515</span> public MasterThread getMasterThread() {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> if (mt.getMaster().isActiveMaster()) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return mt;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> return null;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * Returns the master at the specified
<TRUNCATED>
[16/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
----------------------------------------------------------------------
diff --git a/testapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html b/testapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
index 8684637..00c8bf0 100644
--- a/testapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
+++ b/testapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
@@ -757,7 +757,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getConfiguration</h4>
-<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.125">getConfiguration</a>()</pre>
+<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.119">getConfiguration</a>()</pre>
</li>
</ul>
<a name="startRegionServer-java.lang.String-int-">
@@ -766,7 +766,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startRegionServer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.276">startRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.270">startRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
int port)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#startRegionServer-java.lang.String-int-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -788,7 +788,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>killRegionServer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.281">killRegionServer</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.275">killRegionServer</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#killRegionServer-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Kills the region server process if this is a distributed cluster, otherwise
@@ -807,7 +807,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>isKilledRS</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.292">isKilledRS</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.286">isKilledRS</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#isKilledRS-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Keeping track of killed servers and being able to check if a particular server was killed makes
it possible to do fault tolerance testing for dead servers in a deterministic way. A concrete
@@ -826,7 +826,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopRegionServer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.297">stopRegionServer</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.291">stopRegionServer</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#stopRegionServer-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Stops the given region server, by attempting a gradual stop.</div>
@@ -844,7 +844,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForRegionServerToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.302">waitForRegionServerToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.296">waitForRegionServerToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitForRegionServerToStop-org.apache.hadoop.hbase.ServerName-long-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -863,7 +863,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startZkNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.308">startZkNode</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.302">startZkNode</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
int port)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#startZkNode-java.lang.String-int-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -885,7 +885,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>killZkNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.313">killZkNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.307">killZkNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#killZkNode-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Kills the zookeeper node process if this is a distributed cluster, otherwise,
@@ -904,7 +904,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopZkNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.318">stopZkNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.312">stopZkNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#stopZkNode-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Stops the region zookeeper if this is a distributed cluster, otherwise
@@ -923,7 +923,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForZkNodeToStart</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.323">waitForZkNodeToStart</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.317">waitForZkNodeToStart</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitForZkNodeToStart-org.apache.hadoop.hbase.ServerName-long-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -942,7 +942,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForZkNodeToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.328">waitForZkNodeToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.322">waitForZkNodeToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitForZkNodeToStop-org.apache.hadoop.hbase.ServerName-long-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -961,7 +961,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startDataNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.333">startDataNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.327">startDataNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#startDataNode-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Starts a new datanode on the given hostname or if this is a mini/local cluster,
@@ -980,7 +980,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>killDataNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.338">killDataNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.332">killDataNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#killDataNode-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Kills the datanode process if this is a distributed cluster, otherwise,
@@ -999,7 +999,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopDataNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.343">stopDataNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.337">stopDataNode</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#stopDataNode-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Stops the datanode if this is a distributed cluster, otherwise
@@ -1018,7 +1018,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForDataNodeToStart</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.348">waitForDataNodeToStart</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.342">waitForDataNodeToStart</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitForDataNodeToStart-org.apache.hadoop.hbase.ServerName-long-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -1037,7 +1037,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForDataNodeToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.353">waitForDataNodeToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.347">waitForDataNodeToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitForDataNodeToStop-org.apache.hadoop.hbase.ServerName-long-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -1056,7 +1056,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startMaster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.358">startMaster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.352">startMaster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
int port)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#startMaster-java.lang.String-int-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -1078,7 +1078,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>killMaster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.363">killMaster</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.357">killMaster</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#killMaster-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Kills the master process if this is a distributed cluster, otherwise,
@@ -1097,7 +1097,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopMaster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.368">stopMaster</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.362">stopMaster</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#stopMaster-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Stops the given master, by attempting a gradual stop.</div>
@@ -1115,7 +1115,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForMasterToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.373">waitForMasterToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.367">waitForMasterToStop</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitForMasterToStop-org.apache.hadoop.hbase.ServerName-long-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -1134,7 +1134,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startRegionServer</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.384">startRegionServer</a>()
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.378">startRegionServer</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Starts a region server thread running</div>
<dl>
@@ -1151,7 +1151,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startRegionServerAndWait</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.408">startRegionServerAndWait</a>(long timeout)
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.402">startRegionServerAndWait</a>(long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Starts a region server thread and waits until its processed by master. Throws an exception
when it can't start a region server or when the region server is not processed by master
@@ -1170,7 +1170,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>abortRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.433">abortRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.427">abortRegionServer</a>(int serverNumber)</pre>
<div class="block">Cause a region server to exit doing basic clean up only on its way out.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1184,7 +1184,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopRegionServer</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.446">stopRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.440">stopRegionServer</a>(int serverNumber)</pre>
<div class="block">Shut down the specified region server cleanly</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1200,7 +1200,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopRegionServer</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.460">stopRegionServer</a>(int serverNumber,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.454">stopRegionServer</a>(int serverNumber,
boolean shutdownFS)</pre>
<div class="block">Shut down the specified region server cleanly</div>
<dl>
@@ -1221,7 +1221,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitOnRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.475">waitOnRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.469">waitOnRegionServer</a>(int serverNumber)</pre>
<div class="block">Wait for the specified region server to stop. Removes this thread from list
of running threads.</div>
<dl>
@@ -1238,7 +1238,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>startMaster</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.485">startMaster</a>()
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.479">startMaster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Starts a master thread running</div>
<dl>
@@ -1255,7 +1255,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getMasterAdminService</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/shaded/protobuf/generated.MasterProtos.MasterService.BlockingInterface.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.shaded.protobuf">org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MasterService.BlockingInterface</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.505">getMasterAdminService</a>()</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/shaded/protobuf/generated.MasterProtos.MasterService.BlockingInterface.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.shaded.protobuf">org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MasterService.BlockingInterface</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.499">getMasterAdminService</a>()</pre>
<div class="block">Returns the current active master, if available.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1271,7 +1271,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/master/HMaster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.513">getMaster</a>()</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/master/HMaster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.507">getMaster</a>()</pre>
<div class="block">Returns the current active master, if available.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1285,7 +1285,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getMasterThread</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.521">getMasterThread</a>()</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.515">getMasterThread</a>()</pre>
<div class="block">Returns the current active master thread, if available.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1299,7 +1299,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/master/HMaster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.534">getMaster</a>(int serverNumber)</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/master/HMaster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.528">getMaster</a>(int serverNumber)</pre>
<div class="block">Returns the master at the specified index, if available.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1313,7 +1313,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>abortMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.542">abortMaster</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.536">abortMaster</a>(int serverNumber)</pre>
<div class="block">Cause a master to exit without shutting down entire cluster.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1327,7 +1327,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopMaster</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.555">stopMaster</a>(int serverNumber)</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.549">stopMaster</a>(int serverNumber)</pre>
<div class="block">Shut down the specified master cleanly</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1343,7 +1343,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>stopMaster</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.569">stopMaster</a>(int serverNumber,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.563">stopMaster</a>(int serverNumber,
boolean shutdownFS)</pre>
<div class="block">Shut down the specified master cleanly</div>
<dl>
@@ -1364,7 +1364,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitOnMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.584">waitOnMaster</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.578">waitOnMaster</a>(int serverNumber)</pre>
<div class="block">Wait for the specified master to stop. Removes this thread from list
of running threads.</div>
<dl>
@@ -1381,7 +1381,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>waitForActiveAndReadyMaster</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.597">waitForActiveAndReadyMaster</a>(long timeout)
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.591">waitForActiveAndReadyMaster</a>(long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Blocks until there is an active master and that master has completed
initialization.</div>
@@ -1405,7 +1405,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getMasterThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.616">getMasterThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.610">getMasterThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of master threads.</dd>
@@ -1418,7 +1418,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>getLiveMasterThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.623">getLiveMasterThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.617">getLiveMasterThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of live master threads (skips the aborted and the killed)</dd>
@@ -1431,7 +1431,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.630">join</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.624">join</a>()</pre>
<div class="block">Wait for Mini HBase Cluster to shut down.</div>
</li>
</ul>
@@ -1441,7 +1441,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>shutdown</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.638">shutdown</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.632">shutdown</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Shut down the mini HBase cluster</div>
<dl>
@@ -1458,7 +1458,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<ul class="blockList">
<li class="blockList">
<h4>close</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.645">close</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.639">close</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#close--" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Closes all the resources held open for this cluster. Note that this call does not shutdown
@@ -1484,7 +1484,7 @@ extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.htm
<li class="blockList">
<h4>getClusterStatus</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatus.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ClusterStatus</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.653">getClusterStatus</a>()
+public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatus.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ClusterStatus</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.647">getClusterStatus</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">As of release 2.0.0, this will be removed in HBase 3.0.0
Use <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html#getClusterMetrics--"><code>getClusterMetrics()</code></a> instead.</span></div>
@@ -1500,7 +1500,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getClusterMetrics</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterMetrics.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ClusterMetrics</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.659">getClusterMetrics</a>()
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterMetrics.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ClusterMetrics</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.653">getClusterMetrics</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#getClusterMetrics--" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Returns a ClusterMetrics for this HBase cluster.</div>
@@ -1520,7 +1520,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>flushcache</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.678">flushcache</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.672">flushcache</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions on all participating regionservers.</div>
<dl>
@@ -1535,7 +1535,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>flushcache</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.689">flushcache</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.683">flushcache</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions of the specified table.</div>
<dl>
@@ -1550,7 +1550,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.703">compact</a>(boolean major)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.697">compact</a>(boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions on all participating regionservers.</div>
<dl>
@@ -1565,7 +1565,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.716">compact</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.710">compact</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions of the specified table.</div>
@@ -1581,7 +1581,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getRegionServerThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.731">getRegionServerThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.725">getRegionServerThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of region server threads. Does not return the master even though it is also
@@ -1595,7 +1595,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getLiveRegionServerThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.738">getLiveRegionServerThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.732">getLiveRegionServerThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of live region server threads (skips the aborted and the killed)</dd>
@@ -1608,7 +1608,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getRegionServer</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegionServer.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.747">getRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegionServer.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.741">getRegionServer</a>(int serverNumber)</pre>
<div class="block">Grab a numbered region server of your choice.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1624,7 +1624,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getRegionServer</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegionServer.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.751">getRegionServer</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegionServer.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.745">getRegionServer</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
</li>
</ul>
<a name="getRegions-byte:A-">
@@ -1633,7 +1633,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getRegions</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.758">getRegions</a>(byte[] tableName)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.752">getRegions</a>(byte[] tableName)</pre>
</li>
</ul>
<a name="getRegions-org.apache.hadoop.hbase.TableName-">
@@ -1642,7 +1642,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getRegions</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.762">getRegions</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.756">getRegions</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)</pre>
</li>
</ul>
<a name="getServerWithMeta--">
@@ -1651,7 +1651,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getServerWithMeta</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.779">getServerWithMeta</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.773">getServerWithMeta</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Index into List of <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html#getRegionServerThreads--"><code>getRegionServerThreads()</code></a>
@@ -1665,7 +1665,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getServerWith</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.789">getServerWith</a>(byte[] regionName)</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.783">getServerWith</a>(byte[] regionName)</pre>
<div class="block">Get the location of the specified region</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1682,7 +1682,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getServerHoldingRegion</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.807">getServerHoldingRegion</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tn,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.801">getServerHoldingRegion</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tn,
byte[] regionName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#getServerHoldingRegion-org.apache.hadoop.hbase.TableName-byte:A-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
@@ -1706,7 +1706,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>countServedRegions</h4>
-<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.831">countServedRegions</a>()</pre>
+<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.825">countServedRegions</a>()</pre>
<div class="block">Counts the total numbers of regions being served by the currently online
region servers by asking each how many regions they have. Does not look
at hbase:meta at all. Count includes catalog tables.</div>
@@ -1722,7 +1722,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>killAll</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.846">killAll</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.840">killAll</a>()</pre>
<div class="block">Do a simulated kill all masters and regionservers. Useful when it is
impossible to bring the mini-cluster back for clean shutdown.</div>
</li>
@@ -1733,7 +1733,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>waitUntilShutDown</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.866">waitUntilShutDown</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.860">waitUntilShutDown</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#waitUntilShutDown--" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Wait for HBase Cluster to shut down.</div>
<dl>
@@ -1748,7 +1748,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>findRegionsForTable</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.870">findRegionsForTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.864">findRegionsForTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)</pre>
</li>
</ul>
<a name="getRegionServerIndex-org.apache.hadoop.hbase.ServerName-">
@@ -1757,7 +1757,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getRegionServerIndex</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.884">getRegionServerIndex</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.878">getRegionServerIndex</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
</li>
</ul>
<a name="getMasterIndex-org.apache.hadoop.hbase.ServerName-">
@@ -1766,7 +1766,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getMasterIndex</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.895">getMasterIndex</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
+<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.889">getMasterIndex</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)</pre>
</li>
</ul>
<a name="getAdminProtocol-org.apache.hadoop.hbase.ServerName-">
@@ -1775,7 +1775,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockList">
<li class="blockList">
<h4>getAdminProtocol</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/shaded/protobuf/generated.AdminProtos.AdminService.BlockingInterface.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.shaded.protobuf">org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.906">getAdminProtocol</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/shaded/protobuf/generated.AdminProtos.AdminService.BlockingInterface.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.shaded.protobuf">org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.900">getAdminProtocol</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#getAdminProtocol-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Returns an AdminProtocol interface to the regionserver</div>
@@ -1793,7 +1793,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/ClusterStatu
<ul class="blockListLast">
<li class="blockList">
<h4>getClientProtocol</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/shaded/protobuf/generated.ClientProtos.ClientService.BlockingInterface.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.shaded.protobuf">org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService.BlockingInterface</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.911">getClientProtocol</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/shaded/protobuf/generated.ClientProtos.ClientService.BlockingInterface.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.shaded.protobuf">org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService.BlockingInterface</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.905">getClientProtocol</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/ServerName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">ServerName</a> serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true#getClientProtocol-org.apache.hadoop.hbase.ServerName-" title="class or interface in org.apache.hadoop.hbase">org.apache.hadoop.hbase.HBaseCluster</a></code></span></div>
<div class="block">Returns a ClientProtocol interface to the regionserver</div>
[11/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html b/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
index 2383d35..ef2e351 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html
@@ -131,7 +131,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.135">MiniHBaseCluster.MiniHBaseClusterRegionServer</a>
+<pre>public static class <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.129">MiniHBaseCluster.MiniHBaseClusterRegionServer</a>
extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<div class="block">Subclass so can get at protected methods (none at moment). Also, creates
a FileSystem instance per instantiation. Adds a shutdown own FileSystem
@@ -298,7 +298,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>shutdownThread</h4>
-<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.136">shutdownThread</a></pre>
+<pre>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.130">shutdownThread</a></pre>
</li>
</ul>
<a name="user">
@@ -307,7 +307,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>user</h4>
-<pre>private org.apache.hadoop.hbase.security.User <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.137">user</a></pre>
+<pre>private org.apache.hadoop.hbase.security.User <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.131">user</a></pre>
</li>
</ul>
<a name="killedServers">
@@ -316,7 +316,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>killedServers</h4>
-<pre>static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><org.apache.hadoop.hbase.ServerName> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.143">killedServers</a></pre>
+<pre>static <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><org.apache.hadoop.hbase.ServerName> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.137">killedServers</a></pre>
<div class="block">List of RegionServers killed so far. ServerName also comprises startCode of a server,
so any restarted instances of the same server will have different ServerName and will not
coincide with past dead ones. So there's no need to cleanup this list.</div>
@@ -336,7 +336,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>MiniHBaseClusterRegionServer</h4>
-<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.145">MiniHBaseClusterRegionServer</a>(org.apache.hadoop.conf.Configuration conf)
+<pre>public <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.139">MiniHBaseClusterRegionServer</a>(org.apache.hadoop.conf.Configuration conf)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<dl>
@@ -360,7 +360,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>handleReportForDutyResponse</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.160">handleReportForDutyResponse</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse c)
+<pre>protected void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.154">handleReportForDutyResponse</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse c)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -376,7 +376,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>run</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.168">run</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.162">run</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code> in interface <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
@@ -391,7 +391,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>runRegionServer</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.188">runRegionServer</a>()</pre>
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.182">runRegionServer</a>()</pre>
</li>
</ul>
<a name="kill--">
@@ -400,7 +400,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>kill</h4>
-<pre>protected void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.193">kill</a>()</pre>
+<pre>protected void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.187">kill</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code>kill</code> in class <code>org.apache.hadoop.hbase.regionserver.HRegionServer</code></dd>
@@ -413,7 +413,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockList">
<li class="blockList">
<h4>abort</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.199">abort</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> reason,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.193">abort</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> reason,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -429,7 +429,7 @@ extends org.apache.hadoop.hbase.regionserver.HRegionServer</pre>
<ul class="blockListLast">
<li class="blockList">
<h4>abortRegionServer</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.209">abortRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> reason,
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.MiniHBaseClusterRegionServer.html#line.203">abortRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> reason,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a> cause)</pre>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html b/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
index 4d9d025..0778813 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>static class <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.218">MiniHBaseCluster.SingleFileSystemShutdownThread</a>
+<pre>static class <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.212">MiniHBaseCluster.SingleFileSystemShutdownThread</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</a></pre>
<div class="block">Alternate shutdown hook.
Just shuts down the passed fs, not all as default filesystem hook does.</div>
@@ -241,7 +241,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>fs</h4>
-<pre>private final org.apache.hadoop.fs.FileSystem <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html#line.219">fs</a></pre>
+<pre>private final org.apache.hadoop.fs.FileSystem <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html#line.213">fs</a></pre>
</li>
</ul>
</li>
@@ -258,7 +258,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>SingleFileSystemShutdownThread</h4>
-<pre><a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html#line.220">SingleFileSystemShutdownThread</a>(org.apache.hadoop.fs.FileSystem fs)</pre>
+<pre><a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html#line.214">SingleFileSystemShutdownThread</a>(org.apache.hadoop.fs.FileSystem fs)</pre>
</li>
</ul>
</li>
@@ -275,7 +275,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html
<ul class="blockListLast">
<li class="blockList">
<h4>run</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html#line.225">run</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.SingleFileSystemShutdownThread.html#line.219">run</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--" title="class or interface in java.lang">run</a></code> in interface <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a></code></dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html b/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
index 0c32779..88d8c36 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/MiniHBaseCluster.html
@@ -822,7 +822,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getConfiguration</h4>
-<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.125">getConfiguration</a>()</pre>
+<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.119">getConfiguration</a>()</pre>
</li>
</ul>
<a name="init-int-int-java.util.List-java.lang.Class-java.lang.Class-">
@@ -831,7 +831,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>init</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.237">init</a>(int nMasterNodes,
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.231">init</a>(int nMasterNodes,
int nRegionNodes,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> rsPorts,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends org.apache.hadoop.hbase.master.HMaster> masterClass,
@@ -851,7 +851,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startRegionServer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.276">startRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.270">startRegionServer</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
int port)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#startRegionServer-java.lang.String-int-">HBaseCluster</a></code></span></div>
@@ -873,7 +873,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>killRegionServer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.281">killRegionServer</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.275">killRegionServer</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#killRegionServer-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Kills the region server process if this is a distributed cluster, otherwise
@@ -892,7 +892,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>isKilledRS</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.292">isKilledRS</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.286">isKilledRS</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#isKilledRS-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Keeping track of killed servers and being able to check if a particular server was killed makes
it possible to do fault tolerance testing for dead servers in a deterministic way. A concrete
@@ -911,7 +911,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopRegionServer</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.297">stopRegionServer</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.291">stopRegionServer</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#stopRegionServer-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Stops the given region server, by attempting a gradual stop.</div>
@@ -929,7 +929,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForRegionServerToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.302">waitForRegionServerToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.296">waitForRegionServerToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitForRegionServerToStop-org.apache.hadoop.hbase.ServerName-long-">HBaseCluster</a></code></span></div>
@@ -948,7 +948,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startZkNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.308">startZkNode</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.302">startZkNode</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
int port)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#startZkNode-java.lang.String-int-">HBaseCluster</a></code></span></div>
@@ -970,7 +970,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>killZkNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.313">killZkNode</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.307">killZkNode</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#killZkNode-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Kills the zookeeper node process if this is a distributed cluster, otherwise,
@@ -989,7 +989,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopZkNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.318">stopZkNode</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.312">stopZkNode</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#stopZkNode-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Stops the region zookeeper if this is a distributed cluster, otherwise
@@ -1008,7 +1008,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForZkNodeToStart</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.323">waitForZkNodeToStart</a>(org.apache.hadoop.hbase.ServerName serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.317">waitForZkNodeToStart</a>(org.apache.hadoop.hbase.ServerName serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitForZkNodeToStart-org.apache.hadoop.hbase.ServerName-long-">HBaseCluster</a></code></span></div>
@@ -1027,7 +1027,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForZkNodeToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.328">waitForZkNodeToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.322">waitForZkNodeToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitForZkNodeToStop-org.apache.hadoop.hbase.ServerName-long-">HBaseCluster</a></code></span></div>
@@ -1046,7 +1046,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startDataNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.333">startDataNode</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.327">startDataNode</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#startDataNode-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Starts a new datanode on the given hostname or if this is a mini/local cluster,
@@ -1065,7 +1065,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>killDataNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.338">killDataNode</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.332">killDataNode</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#killDataNode-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Kills the datanode process if this is a distributed cluster, otherwise,
@@ -1084,7 +1084,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopDataNode</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.343">stopDataNode</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.337">stopDataNode</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#stopDataNode-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Stops the datanode if this is a distributed cluster, otherwise
@@ -1103,7 +1103,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForDataNodeToStart</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.348">waitForDataNodeToStart</a>(org.apache.hadoop.hbase.ServerName serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.342">waitForDataNodeToStart</a>(org.apache.hadoop.hbase.ServerName serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitForDataNodeToStart-org.apache.hadoop.hbase.ServerName-long-">HBaseCluster</a></code></span></div>
@@ -1122,7 +1122,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForDataNodeToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.353">waitForDataNodeToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.347">waitForDataNodeToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitForDataNodeToStop-org.apache.hadoop.hbase.ServerName-long-">HBaseCluster</a></code></span></div>
@@ -1141,7 +1141,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startMaster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.358">startMaster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.352">startMaster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> hostname,
int port)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#startMaster-java.lang.String-int-">HBaseCluster</a></code></span></div>
@@ -1163,7 +1163,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>killMaster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.363">killMaster</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.357">killMaster</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#killMaster-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Kills the master process if this is a distributed cluster, otherwise,
@@ -1182,7 +1182,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopMaster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.368">stopMaster</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.362">stopMaster</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#stopMaster-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Stops the given master, by attempting a gradual stop.</div>
@@ -1200,7 +1200,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForMasterToStop</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.373">waitForMasterToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.367">waitForMasterToStop</a>(org.apache.hadoop.hbase.ServerName serverName,
long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitForMasterToStop-org.apache.hadoop.hbase.ServerName-long-">HBaseCluster</a></code></span></div>
@@ -1219,7 +1219,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.384">startRegionServer</a>()
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.378">startRegionServer</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Starts a region server thread running</div>
<dl>
@@ -1236,7 +1236,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startRegionServerAndWait</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.408">startRegionServerAndWait</a>(long timeout)
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.402">startRegionServerAndWait</a>(long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Starts a region server thread and waits until its processed by master. Throws an exception
when it can't start a region server or when the region server is not processed by master
@@ -1255,7 +1255,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>abortRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.433">abortRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.427">abortRegionServer</a>(int serverNumber)</pre>
<div class="block">Cause a region server to exit doing basic clean up only on its way out.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1269,7 +1269,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.446">stopRegionServer</a>(int serverNumber)</pre>
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.440">stopRegionServer</a>(int serverNumber)</pre>
<div class="block">Shut down the specified region server cleanly</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1285,7 +1285,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.460">stopRegionServer</a>(int serverNumber,
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.454">stopRegionServer</a>(int serverNumber,
boolean shutdownFS)</pre>
<div class="block">Shut down the specified region server cleanly</div>
<dl>
@@ -1306,7 +1306,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitOnRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.475">waitOnRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.469">waitOnRegionServer</a>(int serverNumber)</pre>
<div class="block">Wait for the specified region server to stop. Removes this thread from list
of running threads.</div>
<dl>
@@ -1323,7 +1323,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>startMaster</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.485">startMaster</a>()
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.479">startMaster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Starts a master thread running</div>
<dl>
@@ -1340,7 +1340,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getMasterAdminService</h4>
-<pre>public org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MasterService.BlockingInterface <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.505">getMasterAdminService</a>()</pre>
+<pre>public org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MasterService.BlockingInterface <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.499">getMasterAdminService</a>()</pre>
<div class="block">Returns the current active master, if available.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1356,7 +1356,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.513">getMaster</a>()</pre>
+<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.507">getMaster</a>()</pre>
<div class="block">Returns the current active master, if available.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1370,7 +1370,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getMasterThread</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.521">getMasterThread</a>()</pre>
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.515">getMasterThread</a>()</pre>
<div class="block">Returns the current active master thread, if available.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1384,7 +1384,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.534">getMaster</a>(int serverNumber)</pre>
+<pre>public org.apache.hadoop.hbase.master.HMaster <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.528">getMaster</a>(int serverNumber)</pre>
<div class="block">Returns the master at the specified index, if available.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -1398,7 +1398,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>abortMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.542">abortMaster</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.536">abortMaster</a>(int serverNumber)</pre>
<div class="block">Cause a master to exit without shutting down entire cluster.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1412,7 +1412,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopMaster</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.555">stopMaster</a>(int serverNumber)</pre>
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.549">stopMaster</a>(int serverNumber)</pre>
<div class="block">Shut down the specified master cleanly</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1428,7 +1428,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>stopMaster</h4>
-<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.569">stopMaster</a>(int serverNumber,
+<pre>public org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.563">stopMaster</a>(int serverNumber,
boolean shutdownFS)</pre>
<div class="block">Shut down the specified master cleanly</div>
<dl>
@@ -1449,7 +1449,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitOnMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.584">waitOnMaster</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.578">waitOnMaster</a>(int serverNumber)</pre>
<div class="block">Wait for the specified master to stop. Removes this thread from list
of running threads.</div>
<dl>
@@ -1466,7 +1466,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>waitForActiveAndReadyMaster</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.597">waitForActiveAndReadyMaster</a>(long timeout)
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.591">waitForActiveAndReadyMaster</a>(long timeout)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Blocks until there is an active master and that master has completed
initialization.</div>
@@ -1490,7 +1490,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getMasterThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.616">getMasterThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.610">getMasterThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of master threads.</dd>
@@ -1503,7 +1503,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>getLiveMasterThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.623">getLiveMasterThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.617">getLiveMasterThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of live master threads (skips the aborted and the killed)</dd>
@@ -1516,7 +1516,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.630">join</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.624">join</a>()</pre>
<div class="block">Wait for Mini HBase Cluster to shut down.</div>
</li>
</ul>
@@ -1526,7 +1526,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>shutdown</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.638">shutdown</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.632">shutdown</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Shut down the mini HBase cluster</div>
<dl>
@@ -1543,7 +1543,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<ul class="blockList">
<li class="blockList">
<h4>close</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.645">close</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.639">close</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#close--">HBaseCluster</a></code></span></div>
<div class="block">Closes all the resources held open for this cluster. Note that this call does not shutdown
@@ -1569,7 +1569,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html" title="c
<li class="blockList">
<h4>getClusterStatus</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.653">getClusterStatus</a>()
+public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.647">getClusterStatus</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">As of release 2.0.0, this will be removed in HBase 3.0.0
Use <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html#getClusterMetrics--"><code>getClusterMetrics()</code></a> instead.</span></div>
@@ -1585,7 +1585,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getClusterMetrics</h4>
-<pre>public org.apache.hadoop.hbase.ClusterMetrics <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.659">getClusterMetrics</a>()
+<pre>public org.apache.hadoop.hbase.ClusterMetrics <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.653">getClusterMetrics</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#getClusterMetrics--">HBaseCluster</a></code></span></div>
<div class="block">Returns a ClusterMetrics for this HBase cluster.</div>
@@ -1605,7 +1605,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>executeFlush</h4>
-<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.664">executeFlush</a>(org.apache.hadoop.hbase.regionserver.HRegion region)
+<pre>private void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.658">executeFlush</a>(org.apache.hadoop.hbase.regionserver.HRegion region)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -1619,7 +1619,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>flushcache</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.678">flushcache</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.672">flushcache</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions on all participating regionservers.</div>
<dl>
@@ -1634,7 +1634,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>flushcache</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.689">flushcache</a>(org.apache.hadoop.hbase.TableName tableName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.683">flushcache</a>(org.apache.hadoop.hbase.TableName tableName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions of the specified table.</div>
<dl>
@@ -1649,7 +1649,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.703">compact</a>(boolean major)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.697">compact</a>(boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions on all participating regionservers.</div>
<dl>
@@ -1664,7 +1664,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.716">compact</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.710">compact</a>(org.apache.hadoop.hbase.TableName tableName,
boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Call flushCache on all regions of the specified table.</div>
@@ -1680,7 +1680,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getRegionServerThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.731">getRegionServerThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.725">getRegionServerThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of region server threads. Does not return the master even though it is also
@@ -1694,7 +1694,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getLiveRegionServerThreads</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.738">getLiveRegionServerThreads</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.732">getLiveRegionServerThreads</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of live region server threads (skips the aborted and the killed)</dd>
@@ -1707,7 +1707,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.regionserver.HRegionServer <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.747">getRegionServer</a>(int serverNumber)</pre>
+<pre>public org.apache.hadoop.hbase.regionserver.HRegionServer <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.741">getRegionServer</a>(int serverNumber)</pre>
<div class="block">Grab a numbered region server of your choice.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1723,7 +1723,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getRegionServer</h4>
-<pre>public org.apache.hadoop.hbase.regionserver.HRegionServer <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.751">getRegionServer</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
+<pre>public org.apache.hadoop.hbase.regionserver.HRegionServer <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.745">getRegionServer</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
</li>
</ul>
<a name="getRegions-byte:A-">
@@ -1732,7 +1732,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getRegions</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.regionserver.HRegion> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.758">getRegions</a>(byte[] tableName)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.regionserver.HRegion> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.752">getRegions</a>(byte[] tableName)</pre>
</li>
</ul>
<a name="getRegions-org.apache.hadoop.hbase.TableName-">
@@ -1741,7 +1741,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getRegions</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.regionserver.HRegion> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.762">getRegions</a>(org.apache.hadoop.hbase.TableName tableName)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.regionserver.HRegion> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.756">getRegions</a>(org.apache.hadoop.hbase.TableName tableName)</pre>
</li>
</ul>
<a name="getServerWithMeta--">
@@ -1750,7 +1750,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getServerWithMeta</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.779">getServerWithMeta</a>()</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.773">getServerWithMeta</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Index into List of <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html#getRegionServerThreads--"><code>getRegionServerThreads()</code></a>
@@ -1764,7 +1764,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getServerWith</h4>
-<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.789">getServerWith</a>(byte[] regionName)</pre>
+<pre>public int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.783">getServerWith</a>(byte[] regionName)</pre>
<div class="block">Get the location of the specified region</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -1781,7 +1781,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getServerHoldingRegion</h4>
-<pre>public org.apache.hadoop.hbase.ServerName <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.807">getServerHoldingRegion</a>(org.apache.hadoop.hbase.TableName tn,
+<pre>public org.apache.hadoop.hbase.ServerName <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.801">getServerHoldingRegion</a>(org.apache.hadoop.hbase.TableName tn,
byte[] regionName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#getServerHoldingRegion-org.apache.hadoop.hbase.TableName-byte:A-">HBaseCluster</a></code></span></div>
@@ -1805,7 +1805,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>countServedRegions</h4>
-<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.831">countServedRegions</a>()</pre>
+<pre>public long <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.825">countServedRegions</a>()</pre>
<div class="block">Counts the total numbers of regions being served by the currently online
region servers by asking each how many regions they have. Does not look
at hbase:meta at all. Count includes catalog tables.</div>
@@ -1821,7 +1821,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>killAll</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.846">killAll</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.840">killAll</a>()</pre>
<div class="block">Do a simulated kill all masters and regionservers. Useful when it is
impossible to bring the mini-cluster back for clean shutdown.</div>
</li>
@@ -1832,7 +1832,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>waitUntilShutDown</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.866">waitUntilShutDown</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.860">waitUntilShutDown</a>()</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#waitUntilShutDown--">HBaseCluster</a></code></span></div>
<div class="block">Wait for HBase Cluster to shut down.</div>
<dl>
@@ -1847,7 +1847,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>findRegionsForTable</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.regionserver.HRegion> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.870">findRegionsForTable</a>(org.apache.hadoop.hbase.TableName tableName)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.hbase.regionserver.HRegion> <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.864">findRegionsForTable</a>(org.apache.hadoop.hbase.TableName tableName)</pre>
</li>
</ul>
<a name="getRegionServerIndex-org.apache.hadoop.hbase.ServerName-">
@@ -1856,7 +1856,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getRegionServerIndex</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.884">getRegionServerIndex</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
+<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.878">getRegionServerIndex</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
</li>
</ul>
<a name="getMasterIndex-org.apache.hadoop.hbase.ServerName-">
@@ -1865,7 +1865,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getMasterIndex</h4>
-<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.895">getMasterIndex</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
+<pre>protected int <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.889">getMasterIndex</a>(org.apache.hadoop.hbase.ServerName serverName)</pre>
</li>
</ul>
<a name="getAdminProtocol-org.apache.hadoop.hbase.ServerName-">
@@ -1874,7 +1874,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockList">
<li class="blockList">
<h4>getAdminProtocol</h4>
-<pre>public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.906">getAdminProtocol</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService.BlockingInterface <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.900">getAdminProtocol</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#getAdminProtocol-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Returns an AdminProtocol interface to the regionserver</div>
@@ -1892,7 +1892,7 @@ public org.apache.hadoop.hbase.ClusterStatus <a href="../../../../src-
<ul class="blockListLast">
<li class="blockList">
<h4>getClientProtocol</h4>
-<pre>public org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService.BlockingInterface <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.911">getClientProtocol</a>(org.apache.hadoop.hbase.ServerName serverName)
+<pre>public org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.ClientService.BlockingInterface <a href="../../../../src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html#line.905">getClientProtocol</a>(org.apache.hadoop.hbase.ServerName serverName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from class: <code><a href="../../../../org/apache/hadoop/hbase/HBaseCluster.html#getClientProtocol-org.apache.hadoop.hbase.ServerName-">HBaseCluster</a></code></span></div>
<div class="block">Returns a ClientProtocol interface to the regionserver</div>
[17/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
----------------------------------------------------------------------
diff --git a/testapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html b/testapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
index 0350b12..80cdb51 100644
--- a/testapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
+++ b/testapidocs/org/apache/hadoop/hbase/HBaseTestingUtility.html
@@ -1832,7 +1832,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>fam1</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1687">fam1</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1677">fam1</a></pre>
</li>
</ul>
<a name="fam2">
@@ -1841,7 +1841,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>fam2</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1688">fam2</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1678">fam2</a></pre>
</li>
</ul>
<a name="fam3">
@@ -1850,7 +1850,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>fam3</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1689">fam3</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1679">fam3</a></pre>
</li>
</ul>
<a name="COLUMNS">
@@ -1859,7 +1859,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>COLUMNS</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1690">COLUMNS</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1680">COLUMNS</a></pre>
</li>
</ul>
<a name="FIRST_CHAR">
@@ -1868,7 +1868,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>FIRST_CHAR</h4>
-<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1693">FIRST_CHAR</a></pre>
+<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1683">FIRST_CHAR</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.FIRST_CHAR">Constant Field Values</a></dd>
@@ -1881,7 +1881,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>LAST_CHAR</h4>
-<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1694">LAST_CHAR</a></pre>
+<pre>public static final char <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1684">LAST_CHAR</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../constant-values.html#org.apache.hadoop.hbase.HBaseTestingUtility.LAST_CHAR">Constant Field Values</a></dd>
@@ -1894,7 +1894,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>START_KEY_BYTES</h4>
-<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1695">START_KEY_BYTES</a></pre>
+<pre>public static final byte[] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1685">START_KEY_BYTES</a></pre>
</li>
</ul>
<a name="START_KEY">
@@ -1903,7 +1903,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>START_KEY</h4>
-<pre>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1696">START_KEY</a></pre>
+<pre>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1686">START_KEY</a></pre>
</li>
</ul>
<a name="ROWS">
@@ -1912,7 +1912,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>ROWS</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2249">ROWS</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2239">ROWS</a></pre>
<div class="block">All the row values for the data loaded by <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#loadTable-org.apache.hadoop.hbase.client.Table-byte:A-"><code>loadTable(Table, byte[])</code></a></div>
</li>
</ul>
@@ -1922,7 +1922,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockList">
<li class="blockList">
<h4>KEYS</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2264">KEYS</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2254">KEYS</a></pre>
</li>
</ul>
<a name="KEYS_FOR_HBA_CREATE_TABLE">
@@ -1931,7 +1931,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<ul class="blockListLast">
<li class="blockList">
<h4>KEYS_FOR_HBA_CREATE_TABLE</h4>
-<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2276">KEYS_FOR_HBA_CREATE_TABLE</a></pre>
+<pre>public static final byte[][] <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.2266">KEYS_FOR_HBA_CREATE_TABLE</a></pre>
</li>
</ul>
</li>
@@ -2025,7 +2025,7 @@ extends <a href="../../../../org/apache/hadoop/hbase/HBaseZKTestingUtility.html"
<li class="blockList">
<h4>createLocalHTU</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.367">createLocalHTU</a>()</pre>
+public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.357">createLocalHTU</a>()</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">use <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#HBaseTestingUtility--"><code>HBaseTestingUtility()</code></a> instead</span></div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -2040,7 +2040,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<li class="blockList">
<h4>createLocalHTU</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.376">createLocalHTU</a>(org.apache.hadoop.conf.Configuration c)</pre>
+public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.366">createLocalHTU</a>(org.apache.hadoop.conf.Configuration c)</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">use <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#HBaseTestingUtility-org.apache.hadoop.conf.Configuration-"><code>HBaseTestingUtility(Configuration)</code></a> instead</span></div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -2054,7 +2054,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>closeRegionAndWAL</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.383">closeRegionAndWAL</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/Region.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">Region</a> r)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.373">closeRegionAndWAL</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/Region.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">Region</a> r)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Close both the region <code>r</code> and it's underlying WAL. For use in tests.</div>
<dl>
@@ -2069,7 +2069,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>closeRegionAndWAL</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.390">closeRegionAndWAL</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a> r)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.380">closeRegionAndWAL</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/HRegion.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">HRegion</a> r)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Close both the HRegion <code>r</code> and it's underlying WAL. For use in tests.</div>
<dl>
@@ -2084,7 +2084,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>getConfiguration</h4>
-<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.409">getConfiguration</a>()</pre>
+<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.399">getConfiguration</a>()</pre>
<div class="block">Returns this classes's instance of <code>Configuration</code>. Be careful how
you use the returned Configuration since <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Connection.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client"><code>Connection</code></a> instances
can be shared. The Map of Connections is keyed by the Configuration. If
@@ -2107,7 +2107,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>setHBaseCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.413">setHBaseCluster</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">HBaseCluster</a> hbaseCluster)</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.403">setHBaseCluster</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/HBaseCluster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">HBaseCluster</a> hbaseCluster)</pre>
</li>
</ul>
<a name="setupDataTestDir--">
@@ -2116,7 +2116,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<ul class="blockList">
<li class="blockList">
<h4>setupDataTestDir</h4>
-<pre>protected org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.434">setupDataTestDir</a>()</pre>
+<pre>protected org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.424">setupDataTestDir</a>()</pre>
<div class="block">Home our data in a dir under <a href="../../../../org/apache/hadoop/hbase/HBaseCommonTestingUtility.html#DEFAULT_BASE_TEST_DIRECTORY"><code>HBaseCommonTestingUtility.DEFAULT_BASE_TEST_DIRECTORY</code></a>.
Give it a random name so can have many concurrent tests running if
we need to. It needs to amend the <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#TEST_DIRECTORY_KEY"><code>TEST_DIRECTORY_KEY</code></a>
@@ -2144,7 +2144,7 @@ public static <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtil
<li class="blockList">
<h4>getMetaTableDescriptor</h4>
<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">HTableDescriptor</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.501">getMetaTableDescriptor</a>()</pre>
+public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">HTableDescriptor</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.491">getMetaTableDescriptor</a>()</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span> <span class="deprecationComment">since 2.0 version and will be removed in 3.0 version.
use <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getMetaTableDescriptorBuilder--"><code>getMetaTableDescriptorBuilder()</code></a></span></div>
<dl>
@@ -2159,7 +2159,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>getMetaTableDescriptorBuilder</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptorBuilder</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.508">getMetaTableDescriptorBuilder</a>()</pre>
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptorBuilder</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.498">getMetaTableDescriptorBuilder</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>META table descriptor</dd>
@@ -2172,7 +2172,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>getDataTestDirOnTestFS</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.522">getDataTestDirOnTestFS</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.512">getDataTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns a Path in the test filesystem, obtained from <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getTestFileSystem--"><code>getTestFileSystem()</code></a>
to write temporary test data. Call this method after setting up the mini dfs cluster
@@ -2191,7 +2191,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>getDataTestDirOnTestFS</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.537">getDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.527">getDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns a Path in the test filesystem, obtained from <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getTestFileSystem--"><code>getTestFileSystem()</code></a>
to write temporary test data. Call this method after setting up the mini dfs cluster
@@ -2212,7 +2212,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>cleanupDataTestDirOnTestFS</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.582">cleanupDataTestDirOnTestFS</a>()
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.572">cleanupDataTestDirOnTestFS</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Cleans the test data directory on the test filesystem.</div>
<dl>
@@ -2229,7 +2229,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>cleanupDataTestDirOnTestFS</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.594">cleanupDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.584">cleanupDataTestDirOnTestFS</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> subdirName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Cleans a subdirectory under the test data directory on the test filesystem.</div>
<dl>
@@ -2246,7 +2246,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.606">startMiniDFSCluster</a>(int servers)
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.596">startMiniDFSCluster</a>(int servers)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start a minidfscluster.</div>
<dl>
@@ -2267,7 +2267,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.621">startMiniDFSCluster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.611">startMiniDFSCluster</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start a minidfscluster.
This is useful if you want to run datanode on distinct hosts for things
@@ -2292,7 +2292,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.639">startMiniDFSCluster</a>(int servers,
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.629">startMiniDFSCluster</a>(int servers,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start a minidfscluster.
@@ -2316,7 +2316,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSCluster</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.656">startMiniDFSCluster</a>(int servers,
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.646">startMiniDFSCluster</a>(int servers,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] racks,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] hosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2332,7 +2332,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniDFSClusterForTestWAL</h4>
-<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.687">startMiniDFSClusterForTestWAL</a>(int namenodePort)
+<pre>public org.apache.hadoop.hdfs.MiniDFSCluster <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.677">startMiniDFSClusterForTestWAL</a>(int namenodePort)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -2346,7 +2346,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>isReadShortCircuitOn</h4>
-<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.723">isReadShortCircuitOn</a>()</pre>
+<pre>public boolean <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.713">isReadShortCircuitOn</a>()</pre>
<div class="block">Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.
This allows to specify this parameter on the command line.
If not set, default is true.</div>
@@ -2358,7 +2358,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>shutdownMiniDFSCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.765">shutdownMiniDFSCluster</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.755">shutdownMiniDFSCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Shuts down instance created by call to <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#startMiniDFSCluster-int-"><code>startMiniDFSCluster(int)</code></a>
or does nothing.</div>
@@ -2374,7 +2374,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.782">startMiniCluster</a>()
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.772">startMiniCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, dfs, and zookeeper.</div>
<dl>
@@ -2393,7 +2393,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.792">startMiniCluster</a>(boolean withWALDir)
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.782">startMiniCluster</a>(boolean withWALDir)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.</div>
<dl>
@@ -2412,7 +2412,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.804">startMiniCluster</a>(int numSlaves,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.794">startMiniCluster</a>(int numSlaves,
boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, dfs, and zookeeper.
@@ -2434,7 +2434,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.822">startMiniCluster</a>(int numSlaves)
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.812">startMiniCluster</a>(int numSlaves)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Start up a minicluster of hbase, optionally dfs, and zookeeper.
Modifies Configuration. Homes the cluster data directory under a random
@@ -2461,7 +2461,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.827">startMiniCluster</a>(int numSlaves,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.817">startMiniCluster</a>(int numSlaves,
boolean create,
boolean withWALDir)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2477,7 +2477,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.839">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.829">startMiniCluster</a>(int numMasters,
int numSlaves,
boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2499,7 +2499,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.851">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.841">startMiniCluster</a>(int numMasters,
int numSlaves)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">start minicluster</div>
@@ -2519,7 +2519,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.857">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.847">startMiniCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
boolean create)
@@ -2536,7 +2536,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.888">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.878">startMiniCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2576,7 +2576,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.898">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.888">startMiniCluster</a>(int numMasters,
int numSlaves,
int numDataNodes)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
@@ -2595,7 +2595,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.930">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.920">startMiniCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/master/HMaster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.master">HMaster</a>> masterClass,
@@ -2640,7 +2640,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.938">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.928">startMiniCluster</a>(int numMasters,
int numSlaves,
int numDataNodes,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
@@ -2659,7 +2659,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.954">startMiniCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.944">startMiniCluster</a>(int numMasters,
int numSlaves,
int numDataNodes,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] dataNodeHosts,
@@ -2686,7 +2686,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.993">startMiniHBaseCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.983">startMiniHBaseCluster</a>(int numMasters,
int numSlaves)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
@@ -2703,7 +2703,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.998">startMiniHBaseCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.988">startMiniHBaseCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> rsPorts)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -2721,7 +2721,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>startMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1018">startMiniHBaseCluster</a>(int numMasters,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1008">startMiniHBaseCluster</a>(int numMasters,
int numSlaves,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>> rsPorts,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a><? extends <a href="../../../../../apidocs/org/apache/hadoop/hbase/master/HMaster.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.master">HMaster</a>> masterClass,
@@ -2757,7 +2757,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>restartHBaseCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1066">restartHBaseCluster</a>(int servers)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1056">restartHBaseCluster</a>(int servers)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<div class="block">Starts the hbase cluster up again after shutting it down previously in a
@@ -2777,7 +2777,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>getMiniHBaseCluster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1090">getMiniHBaseCluster</a>()</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/MiniHBaseCluster.html" title="class in org.apache.hadoop.hbase">MiniHBaseCluster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1080">getMiniHBaseCluster</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Current mini hbase cluster. Only has something in it after a call
@@ -2793,7 +2793,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>shutdownMiniCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1103">shutdownMiniCluster</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1093">shutdownMiniCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Stops mini hbase, zk, and hdfs clusters.</div>
<dl>
@@ -2811,7 +2811,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>shutdownMiniHBaseCluster</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1122">shutdownMiniHBaseCluster</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1112">shutdownMiniHBaseCluster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Shutdown HBase mini cluster. Does not shutdown zk or dfs if running.</div>
<dl>
@@ -2826,7 +2826,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>getDefaultRootDirPath</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1152">getDefaultRootDirPath</a>(boolean create)
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1142">getDefaultRootDirPath</a>(boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Returns the path to the default root dir the minicluster uses. If <code>create</code>
is true, a new root directory path is fetched irrespective of whether it has been fetched
@@ -2846,7 +2846,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>getDefaultRootDirPath</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1167">getDefaultRootDirPath</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1157">getDefaultRootDirPath</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Same as {<a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#getDefaultRootDirPath-boolean-"><code>getDefaultRootDirPath(boolean create)</code></a>
except that <code>create</code> flag is false.
@@ -2865,7 +2865,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createRootDir</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1183">createRootDir</a>(boolean create)
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1173">createRootDir</a>(boolean create)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Creates an hbase rootdir in user home directory. Also creates hbase
version file. Normally you won't make use of this method. Root hbasedir
@@ -2890,7 +2890,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createRootDir</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1198">createRootDir</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1188">createRootDir</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Same as <a href="../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html#createRootDir-boolean-"><code>createRootDir(boolean create)</code></a>
except that <code>create</code> flag is false.</div>
@@ -2908,7 +2908,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createWALRootDir</h4>
-<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1211">createWALRootDir</a>()
+<pre>public org.apache.hadoop.fs.Path <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1201">createWALRootDir</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Creates a hbase walDir in the user's home directory.
Normally you won't make use of this method. Root hbaseWALDir
@@ -2928,7 +2928,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>flush</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1233">flush</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1223">flush</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Flushes all caches in the mini hbase cluster</div>
<dl>
@@ -2943,7 +2943,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>flush</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1241">flush</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1231">flush</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Flushes all caches in the mini hbase cluster</div>
<dl>
@@ -2958,7 +2958,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1249">compact</a>(boolean major)
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1239">compact</a>(boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Compact all regions in the mini hbase cluster</div>
<dl>
@@ -2973,7 +2973,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>compact</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1257">compact</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1247">compact</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
boolean major)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Compact all of a table's reagion in the mini hbase cluster</div>
@@ -2989,7 +2989,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1268">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1258">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> family)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3010,7 +3010,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1280">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1270">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] families)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3031,7 +3031,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1296">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1286">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[] family)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3052,7 +3052,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1309">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1299">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[] family,
int numRegions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3075,7 +3075,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1326">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1316">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3096,7 +3096,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1338">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1328">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table with multiple regions.</div>
@@ -3117,7 +3117,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1350">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1340">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
byte[][] splitKeys)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3140,7 +3140,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1355">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1345">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int numVersions,
byte[] startKey,
@@ -3159,7 +3159,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1375">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1365">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
byte[][] families,
org.apache.hadoop.conf.Configuration c)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3182,7 +3182,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1389">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1379">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
byte[][] families,
byte[][] splitKeys,
org.apache.hadoop.conf.Configuration c)
@@ -3207,7 +3207,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1409">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1399">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
byte[][] families,
byte[][] splitKeys,
<a href="../../../../../apidocs/org/apache/hadoop/hbase/regionserver/BloomType.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.regionserver">BloomType</a> type,
@@ -3236,7 +3236,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1432">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1422">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> htd,
byte[][] splitRows)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table.</div>
@@ -3257,7 +3257,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1450">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1440">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
byte[][] splitKeys,
org.apache.hadoop.conf.Configuration c)
@@ -3282,7 +3282,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1463">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1453">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[] family,
int numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3305,7 +3305,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1476">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1466">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3328,7 +3328,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1490">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1480">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int numVersions,
byte[][] splitKeys)
@@ -3353,7 +3353,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1512">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1502">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3376,7 +3376,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1526">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1516">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int numVersions,
int blockSize)
@@ -3401,7 +3401,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1542">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1532">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int numVersions,
int blockSize,
@@ -3419,7 +3419,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1569">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1559">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[][] families,
int[] numVersions)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3442,7 +3442,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1595">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1585">createTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[] family,
byte[][] splitRows)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -3465,7 +3465,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>createMultiRegionTable</h4>
-<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1614">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
+<pre>public <a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Table.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Table</a> <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1604">createMultiRegionTable</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/TableName.html?is-external=true" title="class or interface in org.apache.hadoop.hbase">TableName</a> tableName,
byte[] family)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Create a table with multiple regions.</div>
@@ -3486,7 +3486,7 @@ public <a href="../../../../../apidocs/org/apache/hadoop/hbase/HTableDescri
<ul class="blockList">
<li class="blockList">
<h4>modifyTableSync</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1622">modifyTableSync</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Admin.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Admin</a> admin,
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html#line.1612">modifyTableSync</a>(<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/Admin.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">Admin</a> admin,
<a href="../../../../../apidocs/org/apache/hadoop/hbase/client/TableDescriptor.html?is-external=true" title="class or interface in org.apache.hadoop.hbase.client">TableDescriptor</a> desc)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
@@ -3504,7 +3504,7 @@ pu
<TRUNCATED>
[14/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
----------------------------------------------------------------------
diff --git a/testapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html b/testapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
index c9fbc98..af2e5b1 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/MiniHBaseCluster.html
@@ -116,811 +116,805 @@
<span class="sourceLineNo">108</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.108"></a>
<span class="sourceLineNo">109</span> throws IOException, InterruptedException {<a name="line.109"></a>
<span class="sourceLineNo">110</span> super(conf);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> if (conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> conf.set(HConstants.MASTER_PORT, "0");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, 0) != -1) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> conf.set(HConstants.MASTER_INFO_PORT, "0");<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> // Hadoop 2<a name="line.118"></a>
-<span class="sourceLineNo">119</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> this.initialClusterStatus = getClusterStatus();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> public Configuration getConfiguration() {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return this.conf;<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * the FileSystem system exit hook does.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> */<a name="line.134"></a>
-<span class="sourceLineNo">135</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> private Thread shutdownThread = null;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> private User user = null;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.143"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> // Hadoop 2<a name="line.112"></a>
+<span class="sourceLineNo">113</span> CompatibilityFactory.getInstance(MetricsAssertHelper.class).init();<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> init(numMasters, numRegionServers, rsPorts, masterClass, regionserverClass);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> this.initialClusterStatus = getClusterStatus();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> public Configuration getConfiguration() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> return this.conf;<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> /**<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Subclass so can get at protected methods (none at moment). Also, creates<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * a FileSystem instance per instantiation. Adds a shutdown own FileSystem<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * on the way out. Shuts down own Filesystem only, not All filesystems as<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * the FileSystem system exit hook does.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public static class MiniHBaseClusterRegionServer extends HRegionServer {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> private Thread shutdownThread = null;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> private User user = null;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * List of RegionServers killed so far. ServerName also comprises startCode of a server,<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * so any restarted instances of the same server will have different ServerName and will not<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * coincide with past dead ones. So there's no need to cleanup this list.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> */<a name="line.136"></a>
+<span class="sourceLineNo">137</span> static Set<ServerName> killedServers = new HashSet<>();<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> throws IOException, InterruptedException {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> super(conf);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> this.user = User.getCurrent();<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> public MiniHBaseClusterRegionServer(Configuration conf)<a name="line.145"></a>
-<span class="sourceLineNo">146</span> throws IOException, InterruptedException {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> super(conf);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> this.user = User.getCurrent();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /*<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @param c<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @param currentfs We return this if we did not make a new one.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @throws IOException<a name="line.156"></a>
-<span class="sourceLineNo">157</span> */<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span> protected void handleReportForDutyResponse(<a name="line.160"></a>
-<span class="sourceLineNo">161</span> final RegionServerStartupResponse c) throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> super.handleReportForDutyResponse(c);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> // Run this thread to shutdown our filesystem on way out.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<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> @Override<a name="line.167"></a>
-<span class="sourceLineNo">168</span> public void run() {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> try {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public Object run() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> runRegionServer();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return null;<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> } catch (Throwable t) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> LOG.error("Exception in run", t);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> } finally {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Run this on the way out.<a name="line.180"></a>
-<span class="sourceLineNo">181</span> if (this.shutdownThread != null) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> this.shutdownThread.start();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> private void runRegionServer() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> super.run();<a name="line.189"></a>
+<span class="sourceLineNo">145</span> /*<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @param c<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * @param currentfs We return this if we did not make a new one.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * @param uniqueName Same name used to help identify the created fs.<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @return A new fs instance if we are up on DistributeFileSystem.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * @throws IOException<a name="line.150"></a>
+<span class="sourceLineNo">151</span> */<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> @Override<a name="line.153"></a>
+<span class="sourceLineNo">154</span> protected void handleReportForDutyResponse(<a name="line.154"></a>
+<span class="sourceLineNo">155</span> final RegionServerStartupResponse c) throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> super.handleReportForDutyResponse(c);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> // Run this thread to shutdown our filesystem on way out.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> this.shutdownThread = new SingleFileSystemShutdownThread(getFileSystem());<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public void run() {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public Object run() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> runRegionServer();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return null;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> });<a name="line.170"></a>
+<span class="sourceLineNo">171</span> } catch (Throwable t) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.error("Exception in run", t);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> } finally {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Run this on the way out.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> if (this.shutdownThread != null) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> this.shutdownThread.start();<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Threads.shutdown(this.shutdownThread, 30000);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> private void runRegionServer() {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> super.run();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span> protected void kill() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> killedServers.add(getServerName());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> super.kill();<a name="line.189"></a>
<span class="sourceLineNo">190</span> }<a name="line.190"></a>
<span class="sourceLineNo">191</span><a name="line.191"></a>
<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> protected void kill() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> killedServers.add(getServerName());<a name="line.194"></a>
-<span class="sourceLineNo">195</span> super.kill();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public void abort(final String reason, final Throwable cause) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public Object run() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> abortRegionServer(reason, cause);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return null;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> });<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> super.abort(reason, cause);<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">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> /**<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * Alternate shutdown hook.<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.216"></a>
-<span class="sourceLineNo">217</span> */<a name="line.217"></a>
-<span class="sourceLineNo">218</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> private final FileSystem fs;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> super("Shutdown of " + fs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> this.fs = fs;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
-<span class="sourceLineNo">225</span> public void run() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> try {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> this.fs.close();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> } catch (NullPointerException npe) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.230"></a>
-<span class="sourceLineNo">231</span> } catch (IOException e) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.warn("Running hook", e);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Class<? extends HMaster> masterClass,<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.239"></a>
-<span class="sourceLineNo">240</span> throws IOException, InterruptedException {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (masterClass == null){<a name="line.242"></a>
-<span class="sourceLineNo">243</span> masterClass = HMaster.class;<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (regionserverClass == null){<a name="line.245"></a>
-<span class="sourceLineNo">246</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> // start up a LocalHBaseCluster<a name="line.249"></a>
-<span class="sourceLineNo">250</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.250"></a>
-<span class="sourceLineNo">251</span> masterClass, regionserverClass);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> // manually add the regionservers as other users<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (rsPorts != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ".hfs."+index++);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> hbaseCluster.startup();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> shutdown();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> throw e;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> } catch (Throwable t) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> LOG.error("Error starting cluster", t);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> shutdown();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> throw new IOException("Shutting down", t);<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>
-<span class="sourceLineNo">275</span> @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> this.startRegionServer();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> LOG.info("Killing " + server.toString());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.285"></a>
-<span class="sourceLineNo">286</span> } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> @Override<a name="line.291"></a>
-<span class="sourceLineNo">292</span> public boolean isKilledRS(ServerName serverName) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
+<span class="sourceLineNo">193</span> public void abort(final String reason, final Throwable cause) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.user.runAs(new PrivilegedAction<Object>() {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> public Object run() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> abortRegionServer(reason, cause);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return null;<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><a name="line.202"></a>
+<span class="sourceLineNo">203</span> private void abortRegionServer(String reason, Throwable cause) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> super.abort(reason, cause);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Alternate shutdown hook.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * Just shuts down the passed fs, not all as default filesystem hook does.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> static class SingleFileSystemShutdownThread extends Thread {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> private final FileSystem fs;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> SingleFileSystemShutdownThread(final FileSystem fs) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> super("Shutdown of " + fs);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> this.fs = fs;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public void run() {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("Hook closing fs=" + this.fs);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.fs.close();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } catch (NullPointerException npe) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> LOG.debug("Need to fix these: " + npe.toString());<a name="line.224"></a>
+<span class="sourceLineNo">225</span> } catch (IOException e) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> LOG.warn("Running hook", e);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> private void init(final int nMasterNodes, final int nRegionNodes, List<Integer> rsPorts,<a name="line.231"></a>
+<span class="sourceLineNo">232</span> Class<? extends HMaster> masterClass,<a name="line.232"></a>
+<span class="sourceLineNo">233</span> Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)<a name="line.233"></a>
+<span class="sourceLineNo">234</span> throws IOException, InterruptedException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (masterClass == null){<a name="line.236"></a>
+<span class="sourceLineNo">237</span> masterClass = HMaster.class;<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span> if (regionserverClass == null){<a name="line.239"></a>
+<span class="sourceLineNo">240</span> regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // start up a LocalHBaseCluster<a name="line.243"></a>
+<span class="sourceLineNo">244</span> hbaseCluster = new LocalHBaseCluster(conf, nMasterNodes, 0,<a name="line.244"></a>
+<span class="sourceLineNo">245</span> masterClass, regionserverClass);<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> // manually add the regionservers as other users<a name="line.247"></a>
+<span class="sourceLineNo">248</span> for (int i = 0; i < nRegionNodes; i++) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> Configuration rsConf = HBaseConfiguration.create(conf);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> if (rsPorts != null) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> User user = HBaseTestingUtility.getDifferentUser(rsConf,<a name="line.253"></a>
+<span class="sourceLineNo">254</span> ".hfs."+index++);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> hbaseCluster.addRegionServer(rsConf, i, user);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> hbaseCluster.startup();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> } catch (IOException e) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> shutdown();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throw e;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } catch (Throwable t) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> LOG.error("Error starting cluster", t);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> shutdown();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException("Shutting down", t);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> @Override<a name="line.269"></a>
+<span class="sourceLineNo">270</span> public void startRegionServer(String hostname, int port) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> this.startRegionServer();<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> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public void killRegionServer(ServerName serverName) throws IOException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> HRegionServer server = getRegionServer(getRegionServerIndex(serverName));<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (server instanceof MiniHBaseClusterRegionServer) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("Killing " + server.toString());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> ((MiniHBaseClusterRegionServer) server).kill();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> } else {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> abortRegionServer(getRegionServerIndex(serverName));<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span> public boolean isKilledRS(ServerName serverName) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return MiniHBaseClusterRegionServer.killedServers.contains(serverName);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span> public void stopRegionServer(ServerName serverName) throws IOException {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> stopRegionServer(getRegionServerIndex(serverName));<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> //ignore timeout for now<a name="line.297"></a>
+<span class="sourceLineNo">298</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.298"></a>
<span class="sourceLineNo">299</span> }<a name="line.299"></a>
<span class="sourceLineNo">300</span><a name="line.300"></a>
<span class="sourceLineNo">301</span> @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span> public void waitForRegionServerToStop(ServerName serverName, long timeout) throws IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> //ignore timeout for now<a name="line.303"></a>
-<span class="sourceLineNo">304</span> waitOnRegionServer(getRegionServerIndex(serverName));<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> @Override<a name="line.307"></a>
-<span class="sourceLineNo">308</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> @Override<a name="line.322"></a>
-<span class="sourceLineNo">323</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> @Override<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> @Override<a name="line.332"></a>
-<span class="sourceLineNo">333</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> @Override<a name="line.337"></a>
-<span class="sourceLineNo">338</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> @Override<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> @Override<a name="line.347"></a>
-<span class="sourceLineNo">348</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<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> @Override<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> @Override<a name="line.357"></a>
-<span class="sourceLineNo">358</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.startMaster();<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> @Override<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> abortMaster(getMasterIndex(serverName));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> @Override<a name="line.367"></a>
-<span class="sourceLineNo">368</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> stopMaster(getMasterIndex(serverName));<a name="line.369"></a>
+<span class="sourceLineNo">302</span> public void startZkNode(String hostname, int port) throws IOException {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LOG.warn("Starting zookeeper nodes on mini cluster is not supported");<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span> public void killZkNode(ServerName serverName) throws IOException {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> LOG.warn("Aborting zookeeper nodes on mini cluster is not supported");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span> public void stopZkNode(ServerName serverName) throws IOException {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> LOG.warn("Stopping zookeeper nodes on mini cluster is not supported");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public void waitForZkNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> LOG.warn("Waiting for zookeeper nodes to start on mini cluster is not supported");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span> @Override<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public void waitForZkNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> LOG.warn("Waiting for zookeeper nodes to stop on mini cluster is not supported");<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public void startDataNode(ServerName serverName) throws IOException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> LOG.warn("Starting datanodes on mini cluster is not supported");<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> @Override<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public void killDataNode(ServerName serverName) throws IOException {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> LOG.warn("Aborting datanodes on mini cluster is not supported");<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> @Override<a name="line.336"></a>
+<span class="sourceLineNo">337</span> public void stopDataNode(ServerName serverName) throws IOException {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> LOG.warn("Stopping datanodes on mini cluster is not supported");<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> @Override<a name="line.341"></a>
+<span class="sourceLineNo">342</span> public void waitForDataNodeToStart(ServerName serverName, long timeout) throws IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> LOG.warn("Waiting for datanodes to start on mini cluster is not supported");<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span> public void waitForDataNodeToStop(ServerName serverName, long timeout) throws IOException {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.warn("Waiting for datanodes to stop on mini cluster is not supported");<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span><a name="line.350"></a>
+<span class="sourceLineNo">351</span> @Override<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public void startMaster(String hostname, int port) throws IOException {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> this.startMaster();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Override<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public void killMaster(ServerName serverName) throws IOException {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> abortMaster(getMasterIndex(serverName));<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> @Override<a name="line.361"></a>
+<span class="sourceLineNo">362</span> public void stopMaster(ServerName serverName) throws IOException {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> stopMaster(getMasterIndex(serverName));<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> @Override<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> //ignore timeout for now<a name="line.368"></a>
+<span class="sourceLineNo">369</span> waitOnMaster(getMasterIndex(serverName));<a name="line.369"></a>
<span class="sourceLineNo">370</span> }<a name="line.370"></a>
<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> @Override<a name="line.372"></a>
-<span class="sourceLineNo">373</span> public void waitForMasterToStop(ServerName serverName, long timeout) throws IOException {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> //ignore timeout for now<a name="line.374"></a>
-<span class="sourceLineNo">375</span> waitOnMaster(getMasterIndex(serverName));<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">378</span> /**<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * Starts a region server thread running<a name="line.379"></a>
-<span class="sourceLineNo">380</span> *<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * @throws IOException<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @return New RegionServerThread<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.384"></a>
-<span class="sourceLineNo">385</span> throws IOException {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> User rsUser =<a name="line.387"></a>
-<span class="sourceLineNo">388</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> try {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> t = hbaseCluster.addRegionServer(<a name="line.391"></a>
-<span class="sourceLineNo">392</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> t.start();<a name="line.393"></a>
-<span class="sourceLineNo">394</span> t.waitForServerOnline();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> } catch (InterruptedException ie) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> return t;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * when it can't start a region server or when the region server is not processed by master<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * within the timeout.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return New RegionServerThread<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.408"></a>
-<span class="sourceLineNo">409</span> throws IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> long start = System.currentTimeMillis();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return t;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Threads.sleep(100);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (t.getRegionServer().isOnline()) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.423"></a>
-<span class="sourceLineNo">424</span> } else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> /**<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @param serverNumber Used as index into a list.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public String abortRegionServer(int serverNumber) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> LOG.info("Aborting " + server.toString());<a name="line.435"></a>
-<span class="sourceLineNo">436</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return server.toString();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * Shut down the specified region server cleanly<a name="line.441"></a>
-<span class="sourceLineNo">442</span> *<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * @param serverNumber Used as index into a list.<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * @return the region server that was stopped<a name="line.444"></a>
-<span class="sourceLineNo">445</span> */<a name="line.445"></a>
-<span class="sourceLineNo">446</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> return stopRegionServer(serverNumber, true);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
-<span class="sourceLineNo">451</span> * Shut down the specified region server cleanly<a name="line.451"></a>
-<span class="sourceLineNo">452</span> *<a name="line.452"></a>
-<span class="sourceLineNo">453</span> * @param serverNumber Used as index into a list.<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * you are running multiple regionservers in a test and you shut down one<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * before end of the test.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @return the region server that was stopped<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.460"></a>
-<span class="sourceLineNo">461</span> final boolean shutdownFS) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> JVMClusterUtil.RegionServerThread server =<a name="line.462"></a>
-<span class="sourceLineNo">463</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> LOG.info("Stopping " + server.toString());<a name="line.464"></a>
-<span class="sourceLineNo">465</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return server;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.470"></a>
-<span class="sourceLineNo">471</span> * of running threads.<a name="line.471"></a>
-<span class="sourceLineNo">472</span> * @param serverNumber<a name="line.472"></a>
-<span class="sourceLineNo">473</span> * @return Name of region server that just went down.<a name="line.473"></a>
-<span class="sourceLineNo">474</span> */<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> /**<a name="line.480"></a>
-<span class="sourceLineNo">481</span> * Starts a master thread running<a name="line.481"></a>
-<span class="sourceLineNo">482</span> *<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * @return New RegionServerThread<a name="line.483"></a>
-<span class="sourceLineNo">484</span> */<a name="line.484"></a>
-<span class="sourceLineNo">485</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> User user =<a name="line.487"></a>
-<span class="sourceLineNo">488</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> JVMClusterUtil.MasterThread t = null;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> try {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.492"></a>
-<span class="sourceLineNo">493</span> t.start();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> } catch (InterruptedException ie) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return t;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span> /**<a name="line.500"></a>
-<span class="sourceLineNo">501</span> * Returns the current active master, if available.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @return the active HMaster, null if none is active.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> */<a name="line.503"></a>
-<span class="sourceLineNo">504</span> @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span> /**<a name="line.509"></a>
-<span class="sourceLineNo">510</span> * Returns the current active master, if available.<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * @return the active HMaster, null if none is active.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> */<a name="line.512"></a>
-<span class="sourceLineNo">513</span> public HMaster getMaster() {<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return this.hbaseCluster.getActiveMaster();<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> /**<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Returns the current active master thread, if available.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * @return the active MasterThread, null if none is active.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> */<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public MasterThread getMasterThread() {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (mt.getMaster().isActiveMaster()) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> return mt;<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span> }<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return null;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns the master at the specified index, if available.<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * @return the active HMaster, null if none is active.<a name="line.532"></a>
-<span class="sourceLineNo">533</span> */<a name="line.533"></a>
-<span class="sourceLineNo">534</span> public HMaster getMaster(final int serverNumber) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span> return this.hbaseCluster.getMaster(serverNumber);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * Cause a master to exit without shutting down entire cluster.<a name="line.539"></a>
-<span class="sourceLineNo">540</span> * @param serverNumber Used as index into a list.<a name="line.540"></a>
-<span class="sourceLineNo">541</span> */<a name="line.541"></a>
-<span class="sourceLineNo">542</span> public String abortMaster(int serverNumber) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> HMaster server = getMaster(serverNumber);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> LOG.info("Aborting " + server.toString());<a name="line.544"></a>
-<span class="sourceLineNo">545</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.545"></a>
-<span class="sourceLineNo">546</span> return server.toString();<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span><a name="line.548"></a>
-<span class="sourceLineNo">549</span> /**<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Shut down the specified master cleanly<a name="line.550"></a>
-<span class="sourceLineNo">551</span> *<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * @param serverNumber Used as index into a list.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * @return the region server that was stopped<a name="line.553"></a>
-<span class="sourceLineNo">554</span> */<a name="line.554"></a>
-<span class="sourceLineNo">555</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> return stopMaster(serverNumber, true);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span> /**<a name="line.559"></a>
-<span class="sourceLineNo">560</span> * Shut down the specified master cleanly<a name="line.560"></a>
-<span class="sourceLineNo">561</span> *<a name="line.561"></a>
-<span class="sourceLineNo">562</span> * @param serverNumber Used as index into a list.<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * master's shutdown. Usually we do but you do not want to do this if<a name="line.564"></a>
-<span class="sourceLineNo">565</span> * you are running multiple master in a test and you shut down one<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * before end of the test.<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * @return the master that was stopped<a name="line.567"></a>
-<span class="sourceLineNo">568</span> */<a name="line.568"></a>
-<span class="sourceLineNo">569</span> public JVMClusterUtil.MasterThread stopMaster(int serverNumber,<a name="line.569"></a>
-<span class="sourceLineNo">570</span> final boolean shutdownFS) {<a name="line.570"></a>
-<span class="sourceLineNo">571</span> JVMClusterUtil.MasterThread server =<a name="line.571"></a>
-<span class="sourceLineNo">572</span> hbaseCluster.getMasters().get(serverNumber);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> LOG.info("Stopping " + server.toString());<a name="line.573"></a>
-<span class="sourceLineNo">574</span> server.getMaster().stop("Stopping master " + serverNumber);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> return server;<a name="line.575"></a>
-<span class="sourceLineNo">576</span> }<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span> /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * Wait for the specified master to stop. Removes this thread from list<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * of running threads.<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * @param serverNumber<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * @return Name of master that just went down.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> */<a name="line.583"></a>
-<span class="sourceLineNo">584</span> public String waitOnMaster(final int serverNumber) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return this.hbaseCluster.waitOnMaster(serverNumber);<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span> /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span> * Blocks until there is an active master and that master has completed<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * initialization.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> *<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @return true if an active master becomes available. false if there are no<a name="line.592"></a>
-<span class="sourceLineNo">593</span> * masters left.<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @throws InterruptedException<a name="line.594"></a>
-<span class="sourceLineNo">595</span> */<a name="line.595"></a>
-<span class="sourceLineNo">596</span> @Override<a name="line.596"></a>
-<span class="sourceLineNo">597</span> public boolean waitForActiveAndReadyMaster(long timeout) throws IOException {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> List<JVMClusterUtil.MasterThread> mts;<a name="line.598"></a>
-<span class="sourceLineNo">599</span> long start = System.currentTimeMillis();<a name="line.599"></a>
-<span class="sourceLineNo">600</span> while (!(mts = getMasterThreads()).isEmpty()<a name="line.600"></a>
-<span class="sourceLineNo">601</span> && (System.currentTimeMillis() - start) < timeout) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> for (JVMClusterUtil.MasterThread mt : mts) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (mt.getMaster().isActiveMaster() && mt.getMaster().isInitialized()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> return true;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> }<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span><a name="line.607"></a>
-<span class="sourceLineNo">608</span> Threads.sleep(100);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> }<a name="line.609"></a>
-<span class="sourceLineNo">610</span> return false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * @return List of master threads.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> */<a name="line.615"></a>
-<span class="sourceLineNo">616</span> public List<JVMClusterUtil.MasterThread> getMasterThreads() {<a name="line.616"></a>
-<span class="sourceLineNo">617</span> return this.hbaseCluster.getMasters();<a name="line.617"></a>
-<span class="sourceLineNo">618</span> }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
-<span class="sourceLineNo">621</span> * @return List of live master threads (skips the aborted and the killed)<a name="line.621"></a>
-<span class="sourceLineNo">622</span> */<a name="line.622"></a>
-<span class="sourceLineNo">623</span> public List<JVMClusterUtil.MasterThread> getLiveMasterThreads() {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return this.hbaseCluster.getLiveMasters();<a name="line.624"></a>
-<span class="sourceLineNo">625</span> }<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> /**<a name="line.627"></a>
-<span class="sourceLineNo">628</span> * Wait for Mini HBase Cluster to shut down.<a name="line.628"></a>
-<span class="sourceLineNo">629</span> */<a name="line.629"></a>
-<span class="sourceLineNo">630</span> public void join() {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> this.hbaseCluster.join();<a name="line.631"></a>
-<span class="sourceLineNo">632</span> }<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span> /**<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * Shut down the mini HBase cluster<a name="line.635"></a>
-<span class="sourceLineNo">636</span> */<a name="line.636"></a>
-<span class="sourceLineNo">637</span> @Override<a name="line.637"></a>
-<span class="sourceLineNo">638</span> public void shutdown() throws IOException {<a name="line.638"></a>
-<span class="sourceLineNo">639</span> if (this.hbaseCluster != null) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span> this.hbaseCluster.shutdown();<a name="line.640"></a>
-<span class="sourceLineNo">641</span> }<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> @Override<a name="line.644"></a>
-<span class="sourceLineNo">645</span> public void close() throws IOException {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> /**<a name="line.648"></a>
-<span class="sourceLineNo">649</span> * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0<a name="line.649"></a>
-<span class="sourceLineNo">650</span> * Use {@link #getClusterMetrics()} instead.<a name="line.650"></a>
-<span class="sourceLineNo">651</span> */<a name="line.651"></a>
-<span class="sourceLineNo">652</span> @Deprecated<a name="line.652"></a>
-<span class="sourceLineNo">653</span> public ClusterStatus getClusterStatus() throws IOException {<a name="line.653"></a>
+<span class="sourceLineNo">372</span> /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * Starts a region server thread running<a name="line.373"></a>
+<span class="sourceLineNo">374</span> *<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * @throws IOException<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * @return New RegionServerThread<a name="line.376"></a>
+<span class="sourceLineNo">377</span> */<a name="line.377"></a>
+<span class="sourceLineNo">378</span> public JVMClusterUtil.RegionServerThread startRegionServer()<a name="line.378"></a>
+<span class="sourceLineNo">379</span> throws IOException {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> final Configuration newConf = HBaseConfiguration.create(conf);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> User rsUser =<a name="line.381"></a>
+<span class="sourceLineNo">382</span> HBaseTestingUtility.getDifferentUser(newConf, ".hfs."+index++);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> JVMClusterUtil.RegionServerThread t = null;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> try {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> t = hbaseCluster.addRegionServer(<a name="line.385"></a>
+<span class="sourceLineNo">386</span> newConf, hbaseCluster.getRegionServers().size(), rsUser);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> t.start();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> t.waitForServerOnline();<a name="line.388"></a>
+<span class="sourceLineNo">389</span> } catch (InterruptedException ie) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> throw new IOException("Interrupted adding regionserver to cluster", ie);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span> return t;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * Starts a region server thread and waits until its processed by master. Throws an exception<a name="line.396"></a>
+<span class="sourceLineNo">397</span> * when it can't start a region server or when the region server is not processed by master<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * within the timeout.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> *<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * @return New RegionServerThread<a name="line.400"></a>
+<span class="sourceLineNo">401</span> */<a name="line.401"></a>
+<span class="sourceLineNo">402</span> public JVMClusterUtil.RegionServerThread startRegionServerAndWait(long timeout)<a name="line.402"></a>
+<span class="sourceLineNo">403</span> throws IOException {<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> JVMClusterUtil.RegionServerThread t = startRegionServer();<a name="line.405"></a>
+<span class="sourceLineNo">406</span> ServerName rsServerName = t.getRegionServer().getServerName();<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> long start = System.currentTimeMillis();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> ClusterStatus clusterStatus = getClusterStatus();<a name="line.409"></a>
+<span class="sourceLineNo">410</span> while ((System.currentTimeMillis() - start) < timeout) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (clusterStatus != null && clusterStatus.getServers().contains(rsServerName)) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return t;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span> Threads.sleep(100);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (t.getRegionServer().isOnline()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> throw new IOException("RS: " + rsServerName + " online, but not processed by master");<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> throw new IOException("RS: " + rsServerName + " is offline");<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * Cause a region server to exit doing basic clean up only on its way out.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @param serverNumber Used as index into a list.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> */<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public String abortRegionServer(int serverNumber) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> HRegionServer server = getRegionServer(serverNumber);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> LOG.info("Aborting " + server.toString());<a name="line.429"></a>
+<span class="sourceLineNo">430</span> server.abort("Aborting for tests", new Exception("Trace info"));<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return server.toString();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Shut down the specified region server cleanly<a name="line.435"></a>
+<span class="sourceLineNo">436</span> *<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * @param serverNumber Used as index into a list.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * @return the region server that was stopped<a name="line.438"></a>
+<span class="sourceLineNo">439</span> */<a name="line.439"></a>
+<span class="sourceLineNo">440</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> return stopRegionServer(serverNumber, true);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> /**<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * Shut down the specified region server cleanly<a name="line.445"></a>
+<span class="sourceLineNo">446</span> *<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * @param serverNumber Used as index into a list.<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * @param shutdownFS True is we are to shutdown the filesystem as part of this<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * regionserver's shutdown. Usually we do but you do not want to do this if<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * you are running multiple regionservers in a test and you shut down one<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * before end of the test.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * @return the region server that was stopped<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,<a name="line.454"></a>
+<span class="sourceLineNo">455</span> final boolean shutdownFS) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> JVMClusterUtil.RegionServerThread server =<a name="line.456"></a>
+<span class="sourceLineNo">457</span> hbaseCluster.getRegionServers().get(serverNumber);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> LOG.info("Stopping " + server.toString());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> server.getRegionServer().stop("Stopping rs " + serverNumber);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return server;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> /**<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * Wait for the specified region server to stop. Removes this thread from list<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * of running threads.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * @param serverNumber<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * @return Name of region server that just went down.<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public String waitOnRegionServer(final int serverNumber) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return this.hbaseCluster.waitOnRegionServer(serverNumber);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * Starts a master thread running<a name="line.475"></a>
+<span class="sourceLineNo">476</span> *<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @return New RegionServerThread<a name="line.477"></a>
+<span class="sourceLineNo">478</span> */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public JVMClusterUtil.MasterThread startMaster() throws IOException {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> Configuration c = HBaseConfiguration.create(conf);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> User user =<a name="line.481"></a>
+<span class="sourceLineNo">482</span> HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span> JVMClusterUtil.MasterThread t = null;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> try {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> t = hbaseCluster.addMaster(c, hbaseCluster.getMasters().size(), user);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> t.start();<a name="line.487"></a>
+<span class="sourceLineNo">488</span> } catch (InterruptedException ie) {<a name="line.488"></a>
+<span class="sourceLineNo">489</span> throw new IOException("Interrupted adding master to cluster", ie);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return t;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * Returns the current active master, if available.<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * @return the active HMaster, null if none is active.<a name="line.496"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> @Override<a name="line.498"></a>
+<span class="sourceLineNo">499</span> public MasterService.BlockingInterface getMasterAdminService() {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return this.hbaseCluster.getActiveMaster().getMasterRpcServices();<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span> /**<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * Returns the current active master, if available.<a name="line.504"></a>
+<span class="sourceLineNo">505</span> * @return the active HMaster, null if none is active.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> */<a name="line.506"></a>
+<span class="sourceLineNo">507</span> public HMaster getMaster() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return this.hbaseCluster.getActiveMaster();<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Returns the current active master thread, if available.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> * @return the active MasterThread, null if none is active.<a name="line.513"></a>
+<span class="sourceLineNo">514</span> */<a name="line.514"></a>
+<span class="sourceLineNo">515</span> public MasterThread getMasterThread() {<a name="line.515"></a>
+<span class="sourceLineNo">516</span> for (MasterThread mt: hbaseCluster.getLiveMasters()) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> if (mt.getMaster().isActiveMaster()) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return mt;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> return null;<a name="line.521"></a>
+<span class="sourceLineNo">522</span> }<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> /**<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * Returns the master at the specified index, if available.<a name="line.525"></a>
+<span class="sourceLineNo">526</span> * @return the active HMaster, null if none is active.<a name="line.526"></
<TRUNCATED>
[32/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/checkstyle.rss
----------------------------------------------------------------------
diff --git a/checkstyle.rss b/checkstyle.rss
index db00e1e..f7de9ff 100644
--- a/checkstyle.rss
+++ b/checkstyle.rss
@@ -25,8 +25,8 @@ under the License.
<language>en-us</language>
<copyright>©2007 - 2018 The Apache Software Foundation</copyright>
<item>
- <title>File: 3609,
- Errors: 15879,
+ <title>File: 3610,
+ Errors: 15878,
Warnings: 0,
Infos: 0
</title>
@@ -39540,6 +39540,20 @@ under the License.
</tr>
<tr>
<td>
+ <a href="http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.TestHBaseTestingUtilSpinup.java">org/apache/hadoop/hbase/TestHBaseTestingUtilSpinup.java</a>
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ <td>
+ 0
+ </td>
+ </tr>
+ <tr>
+ <td>
<a href="http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.regionserver.TestFailedAppendAndSync.java">org/apache/hadoop/hbase/regionserver/TestFailedAppendAndSync.java</a>
</td>
<td>
@@ -49293,7 +49307,7 @@ under the License.
0
</td>
<td>
- 61
+ 60
</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/coc.html
----------------------------------------------------------------------
diff --git a/coc.html b/coc.html
index f5b5659..0002484 100644
--- a/coc.html
+++ b/coc.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Code of Conduct Policy
@@ -375,7 +375,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/dependencies.html
----------------------------------------------------------------------
diff --git a/dependencies.html b/dependencies.html
index e7d98d5..f99eceb 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependencies</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -440,7 +440,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/dependency-convergence.html
----------------------------------------------------------------------
diff --git a/dependency-convergence.html b/dependency-convergence.html
index b3df162..23d8e7a 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Reactor Dependency Convergence</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -1105,7 +1105,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/dependency-info.html
----------------------------------------------------------------------
diff --git a/dependency-info.html b/dependency-info.html
index 1c7e3e7..4dceea7 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Dependency Information</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -313,7 +313,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/dependency-management.html
----------------------------------------------------------------------
diff --git a/dependency-management.html b/dependency-management.html
index f55bbd8..79285cb 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180509" />
+ <meta name="Date-Revision-yyyymmdd" content="20180510" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Dependency Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -969,7 +969,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-05-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-05-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/constant-values.html
----------------------------------------------------------------------
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 8f19af6..d860e4f 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -3768,21 +3768,21 @@
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Wed May 9 15:23:26 UTC 2018"</code></td>
+<td class="colLast"><code>"Thu May 10 14:39:10 UTC 2018"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"4f2dfd387779968d3b76a22f1f4189d3278b202d"</code></td>
+<td class="colLast"><code>"8ba2a7eeb967a80d04020e30b2fe8e8652ea1758"</code></td>
</tr>
<tr class="altColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#srcChecksum">srcChecksum</a></code></td>
-<td class="colLast"><code>"3d3c386d39a315d3821dcd77bdbf3342"</code></td>
+<td class="colLast"><code>"c0e2dabb9168862e94db0866785192b1"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.url">
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/index-all.html
----------------------------------------------------------------------
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 9d3e848..6f8e74d 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -9817,6 +9817,8 @@
<dd>
<div class="block">Helper for {@link #channelRead(java.nio.channels.ReadableByteChannel, java.nio.ByteBuffer).</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#channelLocks">channelLocks</a></span> - Variable in class org.apache.hadoop.hbase.io.hfile.bucket.<a href="org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.SaslNegotiateHandler.html#channelRead-org.apache.hbase.thirdparty.io.netty.channel.ChannelHandlerContext-java.lang.Object-">channelRead(ChannelHandlerContext, Object)</a></span> - Method in class org.apache.hadoop.hbase.io.asyncfs.<a href="org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.SaslNegotiateHandler.html" title="class in org.apache.hadoop.hbase.io.asyncfs">FanOutOneBlockAsyncDFSOutputSaslHelper.SaslNegotiateHandler</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.html#channelRead-org.apache.hbase.thirdparty.io.netty.channel.ChannelHandlerContext-java.lang.Object-">channelRead(ChannelHandlerContext, Object)</a></span> - Method in class org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/NettyRpcDuplexHandler.html" title="class in org.apache.hadoop.hbase.ipc">NettyRpcDuplexHandler</a></dt>
@@ -87611,7 +87613,7 @@ service.</div>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure2/ProcedureExecutor.html#refreshConfiguration-org.apache.hadoop.conf.Configuration-">refreshConfiguration(Configuration)</a></span> - Method in class org.apache.hadoop.hbase.procedure2.<a href="org/apache/hadoop/hbase/procedure2/ProcedureExecutor.html" title="class in org.apache.hadoop.hbase.procedure2">ProcedureExecutor</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#refreshFileConnection-int-">refreshFileConnection(int)</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.bucket.<a href="org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#refreshFileConnection-int-java.io.IOException-">refreshFileConnection(int, IOException)</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.bucket.<a href="org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/example/RefreshHFilesClient.html#refreshHFiles-org.apache.hadoop.hbase.TableName-">refreshHFiles(TableName)</a></span> - Method in class org.apache.hadoop.hbase.client.example.<a href="org/apache/hadoop/hbase/client/example/RefreshHFilesClient.html" title="class in org.apache.hadoop.hbase.client.example">RefreshHFilesClient</a></dt>
<dd> </dd>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html b/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 99cf475..fccd96e 100644
--- a/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/devapidocs/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -622,7 +622,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRegionServer</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.171">addRegionServer</a>()
+<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.186">addRegionServer</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -636,7 +636,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRegionServer</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.177">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.192">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
int index)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
@@ -651,7 +651,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addRegionServer</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.191">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.206">addRegionServer</a>(org.apache.hadoop.conf.Configuration config,
int index,
<a href="../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -669,7 +669,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addMaster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.203">addMaster</a>()
+<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.218">addMaster</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -683,7 +683,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addMaster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.207">addMaster</a>(org.apache.hadoop.conf.Configuration c,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.222">addMaster</a>(org.apache.hadoop.conf.Configuration c,
int index)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
@@ -698,7 +698,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>addMaster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.218">addMaster</a>(org.apache.hadoop.conf.Configuration c,
+<pre>public <a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.233">addMaster</a>(org.apache.hadoop.conf.Configuration c,
int index,
<a href="../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
@@ -716,7 +716,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getRegionServer</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.234">getRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.249">getRegionServer</a>(int serverNumber)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>serverNumber</code> - </dd>
@@ -731,7 +731,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getRegionServers</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.241">getRegionServers</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.256">getRegionServers</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Read-only list of region server threads.</dd>
@@ -744,7 +744,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getLiveRegionServers</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.250">getLiveRegionServers</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.265">getLiveRegionServers</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of running servers (Some servers may have been killed or
@@ -759,7 +759,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getConfiguration</h4>
-<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.263">getConfiguration</a>()</pre>
+<pre>public org.apache.hadoop.conf.Configuration <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.278">getConfiguration</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>the Configuration used by this LocalHBaseCluster</dd>
@@ -772,7 +772,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.271">waitOnRegionServer</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.286">waitOnRegionServer</a>(int serverNumber)</pre>
<div class="block">Wait for the specified region server to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -786,7 +786,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnRegionServer</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.280">waitOnRegionServer</a>(<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> rst)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.295">waitOnRegionServer</a>(<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.RegionServerThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.RegionServerThread</a> rst)</pre>
<div class="block">Wait for the specified region server to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -800,7 +800,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getMaster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.296">getMaster</a>(int serverNumber)</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.311">getMaster</a>(int serverNumber)</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>the HMaster thread</dd>
@@ -813,7 +813,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getActiveMaster</h4>
-<pre>public <a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.305">getActiveMaster</a>()</pre>
+<pre>public <a href="../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.320">getActiveMaster</a>()</pre>
<div class="block">Gets the current active master, if available. If no active master, returns
null.</div>
<dl>
@@ -828,7 +828,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getMasters</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.319">getMasters</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.334">getMasters</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Read-only list of master threads.</dd>
@@ -841,7 +841,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getLiveMasters</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.328">getLiveMasters</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a>> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.343">getLiveMasters</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>List of running master servers (Some servers may have been killed
@@ -856,7 +856,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.343">waitOnMaster</a>(int serverNumber)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.358">waitOnMaster</a>(int serverNumber)</pre>
<div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -870,7 +870,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>waitOnMaster</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.352">waitOnMaster</a>(<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> masterThread)</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.367">waitOnMaster</a>(<a href="../../../../org/apache/hadoop/hbase/util/JVMClusterUtil.MasterThread.html" title="class in org.apache.hadoop.hbase.util">JVMClusterUtil.MasterThread</a> masterThread)</pre>
<div class="block">Wait for the specified master to stop. Removes this thread from list of running threads.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
@@ -884,7 +884,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>join</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.369">join</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.384">join</a>()</pre>
<div class="block">Wait for Mini HBase Cluster to shut down.
Presumes you've already called <a href="../../../../org/apache/hadoop/hbase/LocalHBaseCluster.html#shutdown--"><code>shutdown()</code></a>.</div>
</li>
@@ -895,7 +895,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>startup</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.397">startup</a>()
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.412">startup</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Start the cluster.</div>
<dl>
@@ -910,7 +910,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>shutdown</h4>
-<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.404">shutdown</a>()</pre>
+<pre>public void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.419">shutdown</a>()</pre>
<div class="block">Shut down the mini HBase cluster</div>
</li>
</ul>
@@ -920,7 +920,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>isLocal</h4>
-<pre>public static boolean <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.412">isLocal</a>(org.apache.hadoop.conf.Configuration c)</pre>
+<pre>public static boolean <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.427">isLocal</a>(org.apache.hadoop.conf.Configuration c)</pre>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>c</code> - Configuration to check.</dd>
@@ -935,7 +935,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.422">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html#line.437">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Test things basically work.</div>
<dl>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 5890b1a..b136486 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -167,10 +167,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index ed476e8..e1568c6 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -550,24 +550,24 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ScannerCallable.MoreResults.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ScannerCallable.MoreResults</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncRequestFutureImpl.Retry</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncProcessTask.SubmittedRows.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncProcessTask.SubmittedRows</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
index ae0124e..ce950b0 100644
--- a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
@@ -104,8 +104,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">ExecutorType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">EventType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">ExecutorType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index bf0f6e6..2747857 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -183,14 +183,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">CompareFilter.CompareOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
index 4d6ff6b..c2613a1 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private static interface <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.294">FileIOEngine.FileAccessor</a></pre>
+<pre>private static interface <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.310">FileIOEngine.FileAccessor</a></pre>
</li>
</ul>
</div>
@@ -155,7 +155,7 @@ var activeTableTab = "activeTableTab";
<ul class="blockListLast">
<li class="blockList">
<h4>access</h4>
-<pre>int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html#line.295">access</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a> fileChannel,
+<pre>int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html#line.311">access</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a> fileChannel,
<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a> byteBuffer,
long accessOffset)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
index 101aabf..fbff701 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private static class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.299">FileIOEngine.FileReadAccessor</a>
+<pre>private static class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.315">FileIOEngine.FileReadAccessor</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html" title="interface in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileAccessor</a></pre>
</li>
@@ -191,7 +191,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockListLast">
<li class="blockList">
<h4>FileReadAccessor</h4>
-<pre>private <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html#line.299">FileReadAccessor</a>()</pre>
+<pre>private <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html#line.315">FileReadAccessor</a>()</pre>
</li>
</ul>
</li>
@@ -208,7 +208,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockListLast">
<li class="blockList">
<h4>access</h4>
-<pre>public int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html#line.301">access</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a> fileChannel,
+<pre>public int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html#line.317">access</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a> fileChannel,
<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a> byteBuffer,
long accessOffset)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
index a773db5..8d5dd69 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>private static class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.307">FileIOEngine.FileWriteAccessor</a>
+<pre>private static class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.323">FileIOEngine.FileWriteAccessor</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html" title="interface in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileAccessor</a></pre>
</li>
@@ -191,7 +191,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockListLast">
<li class="blockList">
<h4>FileWriteAccessor</h4>
-<pre>private <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html#line.307">FileWriteAccessor</a>()</pre>
+<pre>private <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html#line.323">FileWriteAccessor</a>()</pre>
</li>
</ul>
</li>
@@ -208,7 +208,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockListLast">
<li class="blockList">
<h4>access</h4>
-<pre>public int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html#line.309">access</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a> fileChannel,
+<pre>public int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html#line.325">access</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a> fileChannel,
<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a> byteBuffer,
long accessOffset)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
index ee219d8..31a5fcc 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<hr>
<br>
<pre>@InterfaceAudience.Private
-public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.46">FileIOEngine</a>
+public class <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.47">FileIOEngine</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html" title="interface in org.apache.hadoop.hbase.io.hfile.bucket">IOEngine</a></pre>
<div class="block">IO engine that stores data to a file on the local file system.</div>
@@ -168,34 +168,38 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#capacity">capacity</a></span></code> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/ReentrantLock.html?is-external=true" title="class or interface in java.util.concurrent.locks">ReentrantLock</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#channelLocks">channelLocks</a></span></code> </td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#FILE_DELIMITER">FILE_DELIMITER</a></span></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#fileChannels">fileChannels</a></span></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#filePaths">filePaths</a></span></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#LOG">LOG</a></span></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/io/RandomAccessFile.html?is-external=true" title="class or interface in java.io">RandomAccessFile</a>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#rafs">rafs</a></span></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileReadAccessor</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#readAccessor">readAccessor</a></span></code> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><code>private long</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#sizePerFile">sizePerFile</a></span></code> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><code>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileWriteAccessor</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#writeAccessor">writeAccessor</a></span></code> </td>
</tr>
@@ -274,7 +278,8 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
</tr>
<tr id="i7" class="rowColor">
<td class="colFirst"><code>(package private) void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#refreshFileConnection-int-">refreshFileConnection</a></span>(int accessFileNum)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#refreshFileConnection-int-java.io.IOException-">refreshFileConnection</a></span>(int accessFileNum,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a> ioe)</code> </td>
</tr>
<tr id="i8" class="altColor">
<td class="colFirst"><code>void</code></td>
@@ -341,7 +346,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.slf4j.Logger <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.47">LOG</a></pre>
+<pre>private static final org.slf4j.Logger <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.48">LOG</a></pre>
</li>
</ul>
<a name="FILE_DELIMITER">
@@ -350,7 +355,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>FILE_DELIMITER</h4>
-<pre>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.48">FILE_DELIMITER</a></pre>
+<pre>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.49">FILE_DELIMITER</a></pre>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../../../../../constant-values.html#org.apache.hadoop.hbase.io.hfile.bucket.FileIOEngine.FILE_DELIMITER">Constant Field Values</a></dd>
@@ -363,7 +368,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>filePaths</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.49">filePaths</a></pre>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.50">filePaths</a></pre>
</li>
</ul>
<a name="fileChannels">
@@ -372,7 +377,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>fileChannels</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.50">fileChannels</a></pre>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.51">fileChannels</a></pre>
</li>
</ul>
<a name="rafs">
@@ -381,7 +386,16 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>rafs</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/io/RandomAccessFile.html?is-external=true" title="class or interface in java.io">RandomAccessFile</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.51">rafs</a></pre>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/io/RandomAccessFile.html?is-external=true" title="class or interface in java.io">RandomAccessFile</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.52">rafs</a></pre>
+</li>
+</ul>
+<a name="channelLocks">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>channelLocks</h4>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/ReentrantLock.html?is-external=true" title="class or interface in java.util.concurrent.locks">ReentrantLock</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.53">channelLocks</a></pre>
</li>
</ul>
<a name="sizePerFile">
@@ -390,7 +404,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>sizePerFile</h4>
-<pre>private final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.53">sizePerFile</a></pre>
+<pre>private final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.55">sizePerFile</a></pre>
</li>
</ul>
<a name="capacity">
@@ -399,7 +413,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>capacity</h4>
-<pre>private final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.54">capacity</a></pre>
+<pre>private final long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.56">capacity</a></pre>
</li>
</ul>
<a name="readAccessor">
@@ -408,7 +422,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>readAccessor</h4>
-<pre>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileReadAccessor</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.56">readAccessor</a></pre>
+<pre>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileReadAccessor.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileReadAccessor</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.58">readAccessor</a></pre>
</li>
</ul>
<a name="writeAccessor">
@@ -417,7 +431,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockListLast">
<li class="blockList">
<h4>writeAccessor</h4>
-<pre>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileWriteAccessor</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.57">writeAccessor</a></pre>
+<pre>private <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileWriteAccessor.html" title="class in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileWriteAccessor</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.59">writeAccessor</a></pre>
</li>
</ul>
</li>
@@ -434,7 +448,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockListLast">
<li class="blockList">
<h4>FileIOEngine</h4>
-<pre>public <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.59">FileIOEngine</a>(long capacity,
+<pre>public <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.61">FileIOEngine</a>(long capacity,
boolean maintainPersistence,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>... filePaths)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -458,7 +472,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.104">toString</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.108">toString</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in class <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -471,7 +485,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>isPersistent</h4>
-<pre>public boolean <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.114">isPersistent</a>()</pre>
+<pre>public boolean <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.118">isPersistent</a>()</pre>
<div class="block">File IO engine is always able to support persistent storage for the cache</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -487,7 +501,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>read</h4>
-<pre>public <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.127">read</a>(long offset,
+<pre>public <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a> <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.131">read</a>(long offset,
int length,
<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/CacheableDeserializer.html" title="interface in org.apache.hadoop.hbase.io.hfile">CacheableDeserializer</a><<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/Cacheable.html" title="interface in org.apache.hadoop.hbase.io.hfile">Cacheable</a>> deserializer)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -513,7 +527,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>closeFileChannels</h4>
-<pre>void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.146">closeFileChannels</a>()</pre>
+<pre>void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.150">closeFileChannels</a>()</pre>
</li>
</ul>
<a name="write-java.nio.ByteBuffer-long-">
@@ -522,7 +536,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>write</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.163">write</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a> srcBuffer,
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.167">write</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a> srcBuffer,
long offset)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Transfers data from the given byte buffer to file</div>
@@ -543,7 +557,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>sync</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.175">sync</a>()
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.179">sync</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Sync the data to file after writing</div>
<dl>
@@ -560,7 +574,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>shutdown</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.192">shutdown</a>()</pre>
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.196">shutdown</a>()</pre>
<div class="block">Close the file</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -574,7 +588,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>write</h4>
-<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.208">write</a>(<a href="../../../../../../../org/apache/hadoop/hbase/nio/ByteBuff.html" title="class in org.apache.hadoop.hbase.nio">ByteBuff</a> srcBuffer,
+<pre>public void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.212">write</a>(<a href="../../../../../../../org/apache/hadoop/hbase/nio/ByteBuff.html" title="class in org.apache.hadoop.hbase.nio">ByteBuff</a> srcBuffer,
long offset)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/IOEngine.html#write-org.apache.hadoop.hbase.nio.ByteBuff-long-">IOEngine</a></code></span></div>
@@ -596,7 +610,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>accessFile</h4>
-<pre>private void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.215">accessFile</a>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html" title="interface in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileAccessor</a> accessor,
+<pre>private void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.219">accessFile</a>(<a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.FileAccessor.html" title="interface in org.apache.hadoop.hbase.io.hfile.bucket">FileIOEngine.FileAccessor</a> accessor,
<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a> buffer,
long globalOffset)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
@@ -612,7 +626,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>getAbsoluteOffsetInFile</h4>
-<pre>private long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.263">getAbsoluteOffsetInFile</a>(int fileNum,
+<pre>private long <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.266">getAbsoluteOffsetInFile</a>(int fileNum,
long globalOffset)</pre>
<div class="block">Get the absolute offset in given file with the relative global offset.</div>
<dl>
@@ -630,7 +644,7 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>getFileNum</h4>
-<pre>private int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.267">getFileNum</a>(long offset)</pre>
+<pre>private int <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.270">getFileNum</a>(long offset)</pre>
</li>
</ul>
<a name="getFileChannels--">
@@ -639,16 +653,17 @@ implements <a href="../../../../../../../org/apache/hadoop/hbase/io/hfile/bucket
<ul class="blockList">
<li class="blockList">
<h4>getFileChannels</h4>
-<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.280">getFileChannels</a>()</pre>
+<pre><a href="https://docs.oracle.com/javase/8/docs/api/java/nio/channels/FileChannel.html?is-external=true" title="class or interface in java.nio.channels">FileChannel</a>[] <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.283">getFileChannels</a>()</pre>
</li>
</ul>
-<a name="refreshFileConnection-int-">
+<a name="refreshFileConnection-int-java.io.IOException-">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>refreshFileConnection</h4>
-<pre>void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.285">refreshFileConnection</a>(int accessFileNum)
+<pre>void <a href="../../../../../../../src-html/org/apache/hadoop/hbase/io/hfile/bucket/FileIOEngine.html#line.288">refreshFileConnection</a>(int accessFileNum,
+ <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a> ioe)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
[08/34] hbase-site git commit: Published site at
8ba2a7eeb967a80d04020e30b2fe8e8652ea1758.
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/15a025c1/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
index 869f6a1..3b08b86 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.PortAllocator.AvailablePortChecker.html
@@ -341,2502 +341,2502 @@
<span class="sourceLineNo">333</span> // a hbase checksum verification failure will cause unit tests to fail<a name="line.333"></a>
<span class="sourceLineNo">334</span> ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.334"></a>
<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> // if conf is provided, prevent contention for ports if other hbase thread(s) are running<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (conf != null) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.338"></a>
-<span class="sourceLineNo">339</span> == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> LOG.debug("Config property {} changed to -1", HConstants.MASTER_INFO_PORT);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> }<a name="line.342"></a>
-<span class="sourceLineNo">343</span> if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.343"></a>
-<span class="sourceLineNo">344</span> == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> LOG.debug("Config property {} changed to -1", HConstants.REGIONSERVER_PORT);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> // Save this for when setting default file:// breaks things<a name="line.350"></a>
-<span class="sourceLineNo">351</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // Every cluster is a local cluster until we start DFS<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Note that conf could be null, but this.conf will not be<a name="line.354"></a>
-<span class="sourceLineNo">355</span> String dataTestDir = getDataTestDir().toString();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.conf.set("fs.defaultFS","file:///");<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> /**<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @return a normal HBaseTestingUtility<a name="line.364"></a>
-<span class="sourceLineNo">365</span> */<a name="line.365"></a>
-<span class="sourceLineNo">366</span> @Deprecated<a name="line.366"></a>
-<span class="sourceLineNo">367</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return new HBaseTestingUtility();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @return a normal HBaseTestingUtility<a name="line.373"></a>
-<span class="sourceLineNo">374</span> */<a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Deprecated<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> return new HBaseTestingUtility(c);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> */<a name="line.382"></a>
-<span class="sourceLineNo">383</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> closeRegionAndWAL((HRegion)r);<a name="line.384"></a>
+<span class="sourceLineNo">336</span> // Save this for when setting default file:// breaks things<a name="line.336"></a>
+<span class="sourceLineNo">337</span> this.conf.set("original.defaultFS", this.conf.get("fs.defaultFS"));<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Every cluster is a local cluster until we start DFS<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Note that conf could be null, but this.conf will not be<a name="line.340"></a>
+<span class="sourceLineNo">341</span> String dataTestDir = getDataTestDir().toString();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> this.conf.set("fs.defaultFS","file:///");<a name="line.342"></a>
+<span class="sourceLineNo">343</span> this.conf.set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> // If the value for random ports isn't set set it to true, thus making<a name="line.346"></a>
+<span class="sourceLineNo">347</span> // tests opt-out for random port assignment<a name="line.347"></a>
+<span class="sourceLineNo">348</span> this.conf.setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS,<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.conf.getBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, true));<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> /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * @return a normal HBaseTestingUtility<a name="line.354"></a>
+<span class="sourceLineNo">355</span> */<a name="line.355"></a>
+<span class="sourceLineNo">356</span> @Deprecated<a name="line.356"></a>
+<span class="sourceLineNo">357</span> public static HBaseTestingUtility createLocalHTU() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> return new HBaseTestingUtility();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> /**<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @deprecated use {@link HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @return a normal HBaseTestingUtility<a name="line.363"></a>
+<span class="sourceLineNo">364</span> */<a name="line.364"></a>
+<span class="sourceLineNo">365</span> @Deprecated<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> return new HBaseTestingUtility(c);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> /**<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.371"></a>
+<span class="sourceLineNo">372</span> */<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> closeRegionAndWAL((HRegion)r);<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>
+<span class="sourceLineNo">377</span> /**<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (r == null) return;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> r.close();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (r.getWAL() == null) return;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> r.getWAL().close();<a name="line.384"></a>
<span class="sourceLineNo">385</span> }<a name="line.385"></a>
<span class="sourceLineNo">386</span><a name="line.386"></a>
<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.388"></a>
-<span class="sourceLineNo">389</span> */<a name="line.389"></a>
-<span class="sourceLineNo">390</span> public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (r == null) return;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> r.close();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if (r.getWAL() == null) return;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> r.getWAL().close();<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> /**<a name="line.397"></a>
-<span class="sourceLineNo">398</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * you use the returned Configuration since {@link Connection} instances<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * make a copy and use that. Do<a name="line.404"></a>
-<span class="sourceLineNo">405</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return Instance of Configuration.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> */<a name="line.407"></a>
-<span class="sourceLineNo">408</span> @Override<a name="line.408"></a>
-<span class="sourceLineNo">409</span> public Configuration getConfiguration() {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return super.getConfiguration();<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> this.hbaseCluster = hbaseCluster;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> /**<a name="line.417"></a>
-<span class="sourceLineNo">418</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * Give it a random name so can have many concurrent tests running if<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * System property, as it's what minidfscluster bases<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * instances -- another instance could grab the temporary<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * single instance only is how the minidfscluster works.<a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * We also create the underlying directory for<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.429"></a>
-<span class="sourceLineNo">430</span> *<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @return The calculated data test build directory, if newly-created.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> @Override<a name="line.433"></a>
-<span class="sourceLineNo">434</span> protected Path setupDataTestDir() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Path testPath = super.setupDataTestDir();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (null == testPath) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">388</span> * Returns this classes's instance of {@link Configuration}. Be careful how<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * you use the returned Configuration since {@link Connection} instances<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * can be shared. The Map of Connections is keyed by the Configuration. If<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * say, a Connection was being used against a cluster that had been shutdown,<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * be wholesome. Rather than use the return direct, its usually best to<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * make a copy and use that. Do<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * <code>Configuration c = new Configuration(INSTANCE.getConfiguration());</code><a name="line.395"></a>
+<span class="sourceLineNo">396</span> * @return Instance of Configuration.<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> @Override<a name="line.398"></a>
+<span class="sourceLineNo">399</span> public Configuration getConfiguration() {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> return super.getConfiguration();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> this.hbaseCluster = hbaseCluster;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> /**<a name="line.407"></a>
+<span class="sourceLineNo">408</span> * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.408"></a>
+<span class="sourceLineNo">409</span> * Give it a random name so can have many concurrent tests running if<a name="line.409"></a>
+<span class="sourceLineNo">410</span> * we need to. It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.410"></a>
+<span class="sourceLineNo">411</span> * System property, as it's what minidfscluster bases<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * it data dir on. Moding a System property is not the way to do concurrent<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * instances -- another instance could grab the temporary<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * value unintentionally -- but not anything can do about it at moment;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * single instance only is how the minidfscluster works.<a name="line.415"></a>
+<span class="sourceLineNo">416</span> *<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * We also create the underlying directory for<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * in the conf, and as a system property for hadoop.tmp.dir<a name="line.419"></a>
+<span class="sourceLineNo">420</span> *<a name="line.420"></a>
+<span class="sourceLineNo">421</span> * @return The calculated data test build directory, if newly-created.<a name="line.421"></a>
+<span class="sourceLineNo">422</span> */<a name="line.422"></a>
+<span class="sourceLineNo">423</span> @Override<a name="line.423"></a>
+<span class="sourceLineNo">424</span> protected Path setupDataTestDir() {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Path testPath = super.setupDataTestDir();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (null == testPath) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return null;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> createSubDirAndSystemProperty(<a name="line.430"></a>
+<span class="sourceLineNo">431</span> "hadoop.log.dir",<a name="line.431"></a>
+<span class="sourceLineNo">432</span> testPath, "hadoop-log-dir");<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // we want our own value to ensure uniqueness on the same machine<a name="line.435"></a>
+<span class="sourceLineNo">436</span> createSubDirAndSystemProperty(<a name="line.436"></a>
+<span class="sourceLineNo">437</span> "hadoop.tmp.dir",<a name="line.437"></a>
+<span class="sourceLineNo">438</span> testPath, "hadoop-tmp-dir");<a name="line.438"></a>
<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> createSubDirAndSystemProperty(<a name="line.440"></a>
-<span class="sourceLineNo">441</span> "hadoop.log.dir",<a name="line.441"></a>
-<span class="sourceLineNo">442</span> testPath, "hadoop-log-dir");<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.444"></a>
-<span class="sourceLineNo">445</span> // we want our own value to ensure uniqueness on the same machine<a name="line.445"></a>
-<span class="sourceLineNo">446</span> createSubDirAndSystemProperty(<a name="line.446"></a>
-<span class="sourceLineNo">447</span> "hadoop.tmp.dir",<a name="line.447"></a>
-<span class="sourceLineNo">448</span> testPath, "hadoop-tmp-dir");<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.450"></a>
-<span class="sourceLineNo">451</span> createSubDir(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> "mapreduce.cluster.local.dir",<a name="line.452"></a>
-<span class="sourceLineNo">453</span> testPath, "mapred-local-dir");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return testPath;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private void createSubDirAndSystemProperty(<a name="line.458"></a>
-<span class="sourceLineNo">459</span> String propertyName, Path parent, String subDirName){<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> String sysValue = System.getProperty(propertyName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (sysValue != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // There is already a value set. So we do nothing but hope<a name="line.464"></a>
-<span class="sourceLineNo">465</span> // that there will be no conflicts<a name="line.465"></a>
-<span class="sourceLineNo">466</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.466"></a>
-<span class="sourceLineNo">467</span> sysValue + " so I do NOT create it in " + parent);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> String confValue = conf.get(propertyName);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.warn(<a name="line.470"></a>
-<span class="sourceLineNo">471</span> propertyName + " property value differs in configuration and system: "+<a name="line.471"></a>
-<span class="sourceLineNo">472</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.472"></a>
-<span class="sourceLineNo">473</span> " Erasing configuration value by system value."<a name="line.473"></a>
-<span class="sourceLineNo">474</span> );<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
-<span class="sourceLineNo">476</span> conf.set(propertyName, sysValue);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.478"></a>
-<span class="sourceLineNo">479</span> createSubDir(propertyName, parent, subDirName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * for the test filesystem by default<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @see #setupDataTestDirOnTestFS()<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @see #getTestFileSystem()<a name="line.488"></a>
+<span class="sourceLineNo">440</span> // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.440"></a>
+<span class="sourceLineNo">441</span> createSubDir(<a name="line.441"></a>
+<span class="sourceLineNo">442</span> "mapreduce.cluster.local.dir",<a name="line.442"></a>
+<span class="sourceLineNo">443</span> testPath, "mapred-local-dir");<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> return testPath;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> private void createSubDirAndSystemProperty(<a name="line.448"></a>
+<span class="sourceLineNo">449</span> String propertyName, Path parent, String subDirName){<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> String sysValue = System.getProperty(propertyName);<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> if (sysValue != null) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // There is already a value set. So we do nothing but hope<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // that there will be no conflicts<a name="line.455"></a>
+<span class="sourceLineNo">456</span> LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.456"></a>
+<span class="sourceLineNo">457</span> sysValue + " so I do NOT create it in " + parent);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> String confValue = conf.get(propertyName);<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (confValue != null && !confValue.endsWith(sysValue)){<a name="line.459"></a>
+<span class="sourceLineNo">460</span> LOG.warn(<a name="line.460"></a>
+<span class="sourceLineNo">461</span> propertyName + " property value differs in configuration and system: "+<a name="line.461"></a>
+<span class="sourceLineNo">462</span> "Configuration="+confValue+" while System="+sysValue+<a name="line.462"></a>
+<span class="sourceLineNo">463</span> " Erasing configuration value by system value."<a name="line.463"></a>
+<span class="sourceLineNo">464</span> );<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> conf.set(propertyName, sysValue);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> } else {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> // Ok, it's not set, so we create it as a subdirectory<a name="line.468"></a>
+<span class="sourceLineNo">469</span> createSubDir(propertyName, parent, subDirName);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> System.setProperty(propertyName, conf.get(propertyName));<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span> }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> /**<a name="line.474"></a>
+<span class="sourceLineNo">475</span> * @return Where to write test data on the test filesystem; Returns working directory<a name="line.475"></a>
+<span class="sourceLineNo">476</span> * for the test filesystem by default<a name="line.476"></a>
+<span class="sourceLineNo">477</span> * @see #setupDataTestDirOnTestFS()<a name="line.477"></a>
+<span class="sourceLineNo">478</span> * @see #getTestFileSystem()<a name="line.478"></a>
+<span class="sourceLineNo">479</span> */<a name="line.479"></a>
+<span class="sourceLineNo">480</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> FileSystem fs = getTestFileSystem();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> /**<a name="line.485"></a>
+<span class="sourceLineNo">486</span> * @return META table descriptor<a name="line.486"></a>
+<span class="sourceLineNo">487</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.488"></a>
<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> FileSystem fs = getTestFileSystem();<a name="line.491"></a>
-<span class="sourceLineNo">492</span> return new Path(fs.getWorkingDirectory(), "test-data");<a name="line.492"></a>
+<span class="sourceLineNo">490</span> @Deprecated<a name="line.490"></a>
+<span class="sourceLineNo">491</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.492"></a>
<span class="sourceLineNo">493</span> }<a name="line.493"></a>
<span class="sourceLineNo">494</span><a name="line.494"></a>
<span class="sourceLineNo">495</span> /**<a name="line.495"></a>
<span class="sourceLineNo">496</span> * @return META table descriptor<a name="line.496"></a>
-<span class="sourceLineNo">497</span> * @deprecated since 2.0 version and will be removed in 3.0 version.<a name="line.497"></a>
-<span class="sourceLineNo">498</span> * use {@link #getMetaTableDescriptorBuilder()}<a name="line.498"></a>
-<span class="sourceLineNo">499</span> */<a name="line.499"></a>
-<span class="sourceLineNo">500</span> @Deprecated<a name="line.500"></a>
-<span class="sourceLineNo">501</span> public HTableDescriptor getMetaTableDescriptor() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> return new ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span> /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @return META table descriptor<a name="line.506"></a>
-<span class="sourceLineNo">507</span> */<a name="line.507"></a>
-<span class="sourceLineNo">508</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> try {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> } catch (IOException e) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span> /**<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * if the test relies on it.<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * @return a unique path in the test filesystem<a name="line.520"></a>
-<span class="sourceLineNo">521</span> */<a name="line.521"></a>
-<span class="sourceLineNo">522</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> if (dataTestDirOnTestFS == null) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> setupDataTestDirOnTestFS();<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> return dataTestDirOnTestFS;<a name="line.527"></a>
-<span class="sourceLineNo">528</span> }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> /**<a name="line.530"></a>
-<span class="sourceLineNo">531</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.531"></a>
-<span class="sourceLineNo">532</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.532"></a>
-<span class="sourceLineNo">533</span> * if the test relies on it.<a name="line.533"></a>
-<span class="sourceLineNo">534</span> * @return a unique path in the test filesystem<a name="line.534"></a>
-<span class="sourceLineNo">535</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.535"></a>
-<span class="sourceLineNo">536</span> */<a name="line.536"></a>
-<span class="sourceLineNo">537</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> /**<a name="line.541"></a>
-<span class="sourceLineNo">542</span> * Sets up a path in test filesystem to be used by tests.<a name="line.542"></a>
-<span class="sourceLineNo">543</span> * Creates a new directory if not already setup.<a name="line.543"></a>
-<span class="sourceLineNo">544</span> */<a name="line.544"></a>
-<span class="sourceLineNo">545</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> if (dataTestDirOnTestFS != null) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.547"></a>
-<span class="sourceLineNo">548</span> + dataTestDirOnTestFS.toString());<a name="line.548"></a>
-<span class="sourceLineNo">549</span> return;<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.551"></a>
-<span class="sourceLineNo">552</span> }<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> /**<a name="line.554"></a>
-<span class="sourceLineNo">555</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.555"></a>
-<span class="sourceLineNo">556</span> */<a name="line.556"></a>
-<span class="sourceLineNo">557</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.558"></a>
-<span class="sourceLineNo">559</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.559"></a>
-<span class="sourceLineNo">560</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.560"></a>
-<span class="sourceLineNo">561</span> //the working directory, and create a unique sub dir there<a name="line.561"></a>
-<span class="sourceLineNo">562</span> FileSystem fs = getTestFileSystem();<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Path newDataTestDir;<a name="line.563"></a>
-<span class="sourceLineNo">564</span> String randomStr = UUID.randomUUID().toString();<a name="line.564"></a>
-<span class="sourceLineNo">565</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } else {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> Path base = getBaseTestDirOnTestFS();<a name="line.570"></a>
-<span class="sourceLineNo">571</span> newDataTestDir = new Path(base, randomStr);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> }<a name="line.573"></a>
-<span class="sourceLineNo">574</span> return newDataTestDir;<a name="line.574"></a>
-<span class="sourceLineNo">575</span> }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * Cleans the test data directory on the test filesystem.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> * @return True if we removed the test dirs<a name="line.579"></a>
-<span class="sourceLineNo">580</span> * @throws IOException<a name="line.580"></a>
-<span class="sourceLineNo">581</span> */<a name="line.581"></a>
-<span class="sourceLineNo">582</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (ret)<a name="line.584"></a>
-<span class="sourceLineNo">585</span> dataTestDirOnTestFS = null;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> return ret;<a name="line.586"></a>
+<span class="sourceLineNo">497</span> */<a name="line.497"></a>
+<span class="sourceLineNo">498</span> public TableDescriptorBuilder getMetaTableDescriptorBuilder() {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> return FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> } catch (IOException e) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> /**<a name="line.506"></a>
+<span class="sourceLineNo">507</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.507"></a>
+<span class="sourceLineNo">508</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.508"></a>
+<span class="sourceLineNo">509</span> * if the test relies on it.<a name="line.509"></a>
+<span class="sourceLineNo">510</span> * @return a unique path in the test filesystem<a name="line.510"></a>
+<span class="sourceLineNo">511</span> */<a name="line.511"></a>
+<span class="sourceLineNo">512</span> public Path getDataTestDirOnTestFS() throws IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (dataTestDirOnTestFS == null) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> setupDataTestDirOnTestFS();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> return dataTestDirOnTestFS;<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> /**<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.521"></a>
+<span class="sourceLineNo">522</span> * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.522"></a>
+<span class="sourceLineNo">523</span> * if the test relies on it.<a name="line.523"></a>
+<span class="sourceLineNo">524</span> * @return a unique path in the test filesystem<a name="line.524"></a>
+<span class="sourceLineNo">525</span> * @param subdirName name of the subdir to create under the base test dir<a name="line.525"></a>
+<span class="sourceLineNo">526</span> */<a name="line.526"></a>
+<span class="sourceLineNo">527</span> public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> /**<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * Sets up a path in test filesystem to be used by tests.<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * Creates a new directory if not already setup.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> */<a name="line.534"></a>
+<span class="sourceLineNo">535</span> private void setupDataTestDirOnTestFS() throws IOException {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> if (dataTestDirOnTestFS != null) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> LOG.warn("Data test on test fs dir already setup in "<a name="line.537"></a>
+<span class="sourceLineNo">538</span> + dataTestDirOnTestFS.toString());<a name="line.538"></a>
+<span class="sourceLineNo">539</span> return;<a name="line.539"></a>
+<span class="sourceLineNo">540</span> }<a name="line.540"></a>
+<span class="sourceLineNo">541</span> dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.541"></a>
+<span class="sourceLineNo">542</span> }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span> /**<a name="line.544"></a>
+<span class="sourceLineNo">545</span> * Sets up a new path in test filesystem to be used by tests.<a name="line.545"></a>
+<span class="sourceLineNo">546</span> */<a name="line.546"></a>
+<span class="sourceLineNo">547</span> private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> //The file system can be either local, mini dfs, or if the configuration<a name="line.548"></a>
+<span class="sourceLineNo">549</span> //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.549"></a>
+<span class="sourceLineNo">550</span> //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.550"></a>
+<span class="sourceLineNo">551</span> //the working directory, and create a unique sub dir there<a name="line.551"></a>
+<span class="sourceLineNo">552</span> FileSystem fs = getTestFileSystem();<a name="line.552"></a>
+<span class="sourceLineNo">553</span> Path newDataTestDir;<a name="line.553"></a>
+<span class="sourceLineNo">554</span> String randomStr = UUID.randomUUID().toString();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.555"></a>
+<span class="sourceLineNo">556</span> newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> File dataTestDir = new File(newDataTestDir.toString());<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.558"></a>
+<span class="sourceLineNo">559</span> } else {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> Path base = getBaseTestDirOnTestFS();<a name="line.560"></a>
+<span class="sourceLineNo">561</span> newDataTestDir = new Path(base, randomStr);<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> return newDataTestDir;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Cleans the test data directory on the test filesystem.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * @return True if we removed the test dirs<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * @throws IOException<a name="line.570"></a>
+<span class="sourceLineNo">571</span> */<a name="line.571"></a>
+<span class="sourceLineNo">572</span> public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.573"></a>
+<span class="sourceLineNo">574</span> if (ret)<a name="line.574"></a>
+<span class="sourceLineNo">575</span> dataTestDirOnTestFS = null;<a name="line.575"></a>
+<span class="sourceLineNo">576</span> return ret;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> /**<a name="line.579"></a>
+<span class="sourceLineNo">580</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.580"></a>
+<span class="sourceLineNo">581</span> * @return True if we removed child<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * @throws IOException<a name="line.582"></a>
+<span class="sourceLineNo">583</span> */<a name="line.583"></a>
+<span class="sourceLineNo">584</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> return getTestFileSystem().delete(cpath, true);<a name="line.586"></a>
<span class="sourceLineNo">587</span> }<a name="line.587"></a>
<span class="sourceLineNo">588</span><a name="line.588"></a>
<span class="sourceLineNo">589</span> /**<a name="line.589"></a>
-<span class="sourceLineNo">590</span> * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> * @return True if we removed child<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * @throws IOException<a name="line.592"></a>
-<span class="sourceLineNo">593</span> */<a name="line.593"></a>
-<span class="sourceLineNo">594</span> public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.595"></a>
-<span class="sourceLineNo">596</span> return getTestFileSystem().delete(cpath, true);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span> /**<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * Start a minidfscluster.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @param servers How many DNs to start.<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * @throws Exception<a name="line.602"></a>
-<span class="sourceLineNo">603</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * @return The mini dfs cluster created.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> */<a name="line.605"></a>
-<span class="sourceLineNo">606</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.606"></a>
-<span class="sourceLineNo">607</span> return startMiniDFSCluster(servers, null);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> }<a name="line.608"></a>
-<span class="sourceLineNo">609</span><a name="line.609"></a>
-<span class="sourceLineNo">610</span> /**<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * Start a minidfscluster.<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.612"></a>
-<span class="sourceLineNo">613</span> * like HDFS block location verification.<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * datanodes will have the same host name.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param hosts hostnames DNs to run on.<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @throws Exception<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.618"></a>
-<span class="sourceLineNo">619</span> * @return The mini dfs cluster created.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> */<a name="line.620"></a>
-<span class="sourceLineNo">621</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.621"></a>
-<span class="sourceLineNo">622</span> throws Exception {<a name="line.622"></a>
-<span class="sourceLineNo">623</span> if ( hosts != null && hosts.length != 0) {<a name="line.623"></a>
-<span class="sourceLineNo">624</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.624"></a>
-<span class="sourceLineNo">625</span> } else {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> return startMiniDFSCluster(1, null);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span> /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span> * Start a minidfscluster.<a name="line.631"></a>
-<span class="sourceLineNo">632</span> * Can only create one.<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * @param servers How many DNs to start.<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * @param hosts hostnames DNs to run on.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * @throws Exception<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.636"></a>
-<span class="sourceLineNo">637</span> * @return The mini dfs cluster created.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> */<a name="line.638"></a>
-<span class="sourceLineNo">639</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.639"></a>
-<span class="sourceLineNo">640</span> throws Exception {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span> private void setFs() throws IOException {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if(this.dfsCluster == null){<a name="line.645"></a>
-<span class="sourceLineNo">646</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.646"></a>
-<span class="sourceLineNo">647</span> return;<a name="line.647"></a>
-<span class="sourceLineNo">648</span> }<a name="line.648"></a>
-<span class="sourceLineNo">649</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.649"></a>
-<span class="sourceLineNo">650</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span> // re-enable this check with dfs<a name="line.652"></a>
-<span class="sourceLineNo">653</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.653"></a>
-<span class="sourceLineNo">654</span> }<a name="line.654"></a>
-<span class="sourceLineNo">655</span><a name="line.655"></a>
-<span class="sourceLineNo">656</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.656"></a>
-<span class="sourceLineNo">657</span> throws Exception {<a name="line.657"></a>
-<span class="sourceLineNo">658</span> createDirsAndSetProperties();<a name="line.658"></a>
-<span class="sourceLineNo">659</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.659"></a>
-<span class="sourceLineNo">660</span><a name="line.660"></a>
-<span class="sourceLineNo">661</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.661"></a>
-<span class="sourceLineNo">662</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.662"></a>
-<span class="sourceLineNo">663</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.664"></a>
-<span class="sourceLineNo">665</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> TraceUtil.initTracer(conf);<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.669"></a>
-<span class="sourceLineNo">670</span> true, null, racks, hosts, null);<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> // Set this just-started cluster as our filesystem.<a name="line.672"></a>
-<span class="sourceLineNo">673</span> setFs();<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> // Wait for the cluster to be totally up<a name="line.675"></a>
-<span class="sourceLineNo">676</span> this.dfsCluster.waitClusterUp();<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span> //reset the test directory for test file system<a name="line.678"></a>
-<span class="sourceLineNo">679</span> dataTestDirOnTestFS = null;<a name="line.679"></a>
-<span class="sourceLineNo">680</span> String dataTestDir = getDataTestDir().toString();<a name="line.680"></a>
-<span class="sourceLineNo">681</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.681"></a>
-<span class="sourceLineNo">682</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.682"></a>
+<span class="sourceLineNo">590</span> * Start a minidfscluster.<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @param servers How many DNs to start.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * @throws Exception<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.593"></a>
+<span class="sourceLineNo">594</span> * @return The mini dfs cluster created.<a name="line.594"></a>
+<span class="sourceLineNo">595</span> */<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> return startMiniDFSCluster(servers, null);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span><a name="line.599"></a>
+<span class="sourceLineNo">600</span> /**<a name="line.600"></a>
+<span class="sourceLineNo">601</span> * Start a minidfscluster.<a name="line.601"></a>
+<span class="sourceLineNo">602</span> * This is useful if you want to run datanode on distinct hosts for things<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * like HDFS block location verification.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * If you start MiniDFSCluster without host names, all instances of the<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * datanodes will have the same host name.<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * @param hosts hostnames DNs to run on.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> * @throws Exception<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @return The mini dfs cluster created.<a name="line.609"></a>
+<span class="sourceLineNo">610</span> */<a name="line.610"></a>
+<span class="sourceLineNo">611</span> public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.611"></a>
+<span class="sourceLineNo">612</span> throws Exception {<a name="line.612"></a>
+<span class="sourceLineNo">613</span> if ( hosts != null && hosts.length != 0) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return startMiniDFSCluster(hosts.length, hosts);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> } else {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> return startMiniDFSCluster(1, null);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> }<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> /**<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * Start a minidfscluster.<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * Can only create one.<a name="line.622"></a>
+<span class="sourceLineNo">623</span> * @param servers How many DNs to start.<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * @param hosts hostnames DNs to run on.<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * @throws Exception<a name="line.625"></a>
+<span class="sourceLineNo">626</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.626"></a>
+<span class="sourceLineNo">627</span> * @return The mini dfs cluster created.<a name="line.627"></a>
+<span class="sourceLineNo">628</span> */<a name="line.628"></a>
+<span class="sourceLineNo">629</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.629"></a>
+<span class="sourceLineNo">630</span> throws Exception {<a name="line.630"></a>
+<span class="sourceLineNo">631</span> return startMiniDFSCluster(servers, null, hosts);<a name="line.631"></a>
+<span class="sourceLineNo">632</span> }<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> private void setFs() throws IOException {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if(this.dfsCluster == null){<a name="line.635"></a>
+<span class="sourceLineNo">636</span> LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.636"></a>
+<span class="sourceLineNo">637</span> return;<a name="line.637"></a>
+<span class="sourceLineNo">638</span> }<a name="line.638"></a>
+<span class="sourceLineNo">639</span> FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.639"></a>
+<span class="sourceLineNo">640</span> FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span> // re-enable this check with dfs<a name="line.642"></a>
+<span class="sourceLineNo">643</span> conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a name="line.643"></a>
+<span class="sourceLineNo">644</span> }<a name="line.644"></a>
+<span class="sourceLineNo">645</span><a name="line.645"></a>
+<span class="sourceLineNo">646</span> public MiniDFSCluster startMiniDFSCluster(int servers, final String racks[], String hosts[])<a name="line.646"></a>
+<span class="sourceLineNo">647</span> throws Exception {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> createDirsAndSetProperties();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span> // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.651"></a>
+<span class="sourceLineNo">652</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.652"></a>
+<span class="sourceLineNo">653</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.653"></a>
+<span class="sourceLineNo">654</span> org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.654"></a>
+<span class="sourceLineNo">655</span> setLevel(org.apache.log4j.Level.ERROR);<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span> TraceUtil.initTracer(conf);<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span> this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.659"></a>
+<span class="sourceLineNo">660</span> true, null, racks, hosts, null);<a name="line.660"></a>
+<span class="sourceLineNo">661</span><a name="line.661"></a>
+<span class="sourceLineNo">662</span> // Set this just-started cluster as our filesystem.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> setFs();<a name="line.663"></a>
+<span class="sourceLineNo">664</span><a name="line.664"></a>
+<span class="sourceLineNo">665</span> // Wait for the cluster to be totally up<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.dfsCluster.waitClusterUp();<a name="line.666"></a>
+<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">668</span> //reset the test directory for test file system<a name="line.668"></a>
+<span class="sourceLineNo">669</span> dataTestDirOnTestFS = null;<a name="line.669"></a>
+<span class="sourceLineNo">670</span> String dataTestDir = getDataTestDir().toString();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> conf.set(HConstants.HBASE_DIR, dataTestDir);<a name="line.671"></a>
+<span class="sourceLineNo">672</span> LOG.debug("Setting {} to {}", HConstants.HBASE_DIR, dataTestDir);<a name="line.672"></a>
+<span class="sourceLineNo">673</span><a name="line.673"></a>
+<span class="sourceLineNo">674</span> return this.dfsCluster;<a name="line.674"></a>
+<span class="sourceLineNo">675</span> }<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> createDirsAndSetProperties();<a name="line.678"></a>
+<span class="sourceLineNo">679</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.679"></a>
+<span class="sourceLineNo">680</span> null, null, null);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> return dfsCluster;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> return this.dfsCluster;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> public MiniDFSCluster startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> createDirsAndSetProperties();<a name="line.688"></a>
-<span class="sourceLineNo">689</span> dfsCluster = new MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a name="line.689"></a>
-<span class="sourceLineNo">690</span> null, null, null);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> return dfsCluster;<a name="line.691"></a>
-<span class="sourceLineNo">692</span> }<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.694"></a>
-<span class="sourceLineNo">695</span> private void createDirsAndSetProperties() throws IOException {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> setupClusterTestDir();<a name="line.696"></a>
-<span class="sourceLineNo">697</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.697"></a>
-<span class="sourceLineNo">698</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.698"></a>
-<span class="sourceLineNo">699</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.699"></a>
-<span class="sourceLineNo">700</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.700"></a>
-<span class="sourceLineNo">701</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.701"></a>
-<span class="sourceLineNo">702</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.702"></a>
-<span class="sourceLineNo">703</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.703"></a>
-<span class="sourceLineNo">704</span> enableShortCircuit();<a name="line.704"></a>
-<span class="sourceLineNo">705</span><a name="line.705"></a>
-<span class="sourceLineNo">706</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.706"></a>
-<span class="sourceLineNo">707</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.707"></a>
-<span class="sourceLineNo">708</span> new Path(root, "mapred-output-dir").toString());<a name="line.708"></a>
-<span class="sourceLineNo">709</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.709"></a>
-<span class="sourceLineNo">710</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.710"></a>
-<span class="sourceLineNo">711</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.711"></a>
-<span class="sourceLineNo">712</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.712"></a>
-<span class="sourceLineNo">713</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.713"></a>
-<span class="sourceLineNo">714</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.714"></a>
-<span class="sourceLineNo">715</span> }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span><a name="line.717"></a>
-<span class="sourceLineNo">718</span> /**<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * This allows to specify this parameter on the command line.<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * If not set, default is true.<a name="line.721"></a>
-<span class="sourceLineNo">722</span> */<a name="line.722"></a>
-<span class="sourceLineNo">723</span> public boolean isReadShortCircuitOn(){<a name="line.723"></a>
-<span class="sourceLineNo">724</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.724"></a>
-<span class="sourceLineNo">725</span> String readOnProp = System.getProperty(propName);<a name="line.725"></a>
-<span class="sourceLineNo">726</span> if (readOnProp != null){<a name="line.726"></a>
-<span class="sourceLineNo">727</span> return Boolean.parseBoolean(readOnProp);<a name="line.727"></a>
-<span class="sourceLineNo">728</span> } else {<a name="line.728"></a>
-<span class="sourceLineNo">729</span> return conf.getBoolean(propName, false);<a name="line.729"></a>
-<span class="sourceLineNo">730</span> }<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span><a name="line.732"></a>
-<span class="sourceLineNo">733</span> /** Enable the short circuit read, unless configured differently.<a name="line.733"></a>
-<span class="sourceLineNo">734</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.734"></a>
-<span class="sourceLineNo">735</span> */<a name="line.735"></a>
-<span class="sourceLineNo">736</span> private void enableShortCircuit() {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (isReadShortCircuitOn()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> String curUser = System.getProperty("user.name");<a name="line.738"></a>
-<span class="sourceLineNo">739</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> // read short circuit, for hdfs<a name="line.740"></a>
-<span class="sourceLineNo">741</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.741"></a>
-<span class="sourceLineNo">742</span> // read short circuit, for hbase<a name="line.742"></a>
-<span class="sourceLineNo">743</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.743"></a>
-<span class="sourceLineNo">744</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.744"></a>
-<span class="sourceLineNo">745</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.745"></a>
-<span class="sourceLineNo">746</span> } else {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> LOG.info("read short circuit is OFF");<a name="line.747"></a>
-<span class="sourceLineNo">748</span> }<a name="line.748"></a>
-<span class="sourceLineNo">749</span> }<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.751"></a>
-<span class="sourceLineNo">752</span> String path = getDataTestDir(relPath).toString();<a name="line.752"></a>
-<span class="sourceLineNo">753</span> System.setProperty(property, path);<a name="line.753"></a>
-<span class="sourceLineNo">754</span> conf.set(property, path);<a name="line.754"></a>
-<span class="sourceLineNo">755</span> new File(path).mkdirs();<a name="line.755"></a>
-<span class="sourceLineNo">756</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.756"></a>
-<span class="sourceLineNo">757</span> return path;<a name="line.757"></a>
-<span class="sourceLineNo">758</span> }<a name="line.758"></a>
-<span class="sourceLineNo">759</span><a name="line.759"></a>
-<span class="sourceLineNo">760</span> /**<a name="line.760"></a>
-<span class="sourceLineNo">761</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.761"></a>
-<span class="sourceLineNo">762</span> * or does nothing.<a name="line.762"></a>
-<span class="sourceLineNo">763</span> * @throws IOException<a name="line.763"></a>
-<span class="sourceLineNo">764</span> */<a name="line.764"></a>
-<span class="sourceLineNo">765</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.dfsCluster != null) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.767"></a>
-<span class="sourceLineNo">768</span> this.dfsCluster.shutdown();<a name="line.768"></a>
-<span class="sourceLineNo">769</span> dfsCluster = null;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> dataTestDirOnTestFS = null;<a name="line.770"></a>
-<span class="sourceLineNo">771</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.771"></a>
-<span class="sourceLineNo">772</span> }<a name="line.772"></a>
-<span class="sourceLineNo">773</span> }<a name="line.773"></a>
-<span class="sourceLineNo">774</span><a name="line.774"></a>
+<span class="sourceLineNo">684</span> /** This is used before starting HDFS and map-reduce mini-clusters */<a name="line.684"></a>
+<span class="sourceLineNo">685</span> private void createDirsAndSetProperties() throws IOException {<a name="line.685"></a>
+<span class="sourceLineNo">686</span> setupClusterTestDir();<a name="line.686"></a>
+<span class="sourceLineNo">687</span> conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.687"></a>
+<span class="sourceLineNo">688</span> System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> createDirAndSetProperty("cache_data", "test.cache.data");<a name="line.689"></a>
+<span class="sourceLineNo">690</span> createDirAndSetProperty("hadoop_tmp", "hadoop.tmp.dir");<a name="line.690"></a>
+<span class="sourceLineNo">691</span> hadoopLogDir = createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.691"></a>
+<span class="sourceLineNo">692</span> createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a name="line.692"></a>
+<span class="sourceLineNo">693</span> createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a name="line.693"></a>
+<span class="sourceLineNo">694</span> enableShortCircuit();<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span> Path root = getDataTestDirOnTestFS("hadoop");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.697"></a>
+<span class="sourceLineNo">698</span> new Path(root, "mapred-output-dir").toString());<a name="line.698"></a>
+<span class="sourceLineNo">699</span> conf.set("mapreduce.jobtracker.system.dir", new Path(root, "mapred-system-dir").toString());<a name="line.699"></a>
+<span class="sourceLineNo">700</span> conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.700"></a>
+<span class="sourceLineNo">701</span> new Path(root, "mapreduce-jobtracker-staging-root-dir").toString());<a name="line.701"></a>
+<span class="sourceLineNo">702</span> conf.set("mapreduce.job.working.dir", new Path(root, "mapred-working-dir").toString());<a name="line.702"></a>
+<span class="sourceLineNo">703</span> conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.703"></a>
+<span class="sourceLineNo">704</span> new Path(root, "mapreduce-am-staging-root-dir").toString());<a name="line.704"></a>
+<span class="sourceLineNo">705</span> }<a name="line.705"></a>
+<span class="sourceLineNo">706</span><a name="line.706"></a>
+<span class="sourceLineNo">707</span><a name="line.707"></a>
+<span class="sourceLineNo">708</span> /**<a name="line.708"></a>
+<span class="sourceLineNo">709</span> * Get the HBase setting for dfs.client.read.shortcircuit from the conf or a system property.<a name="line.709"></a>
+<span class="sourceLineNo">710</span> * This allows to specify this parameter on the command line.<a name="line.710"></a>
+<span class="sourceLineNo">711</span> * If not set, default is true.<a name="line.711"></a>
+<span class="sourceLineNo">712</span> */<a name="line.712"></a>
+<span class="sourceLineNo">713</span> public boolean isReadShortCircuitOn(){<a name="line.713"></a>
+<span class="sourceLineNo">714</span> final String propName = "hbase.tests.use.shortcircuit.reads";<a name="line.714"></a>
+<span class="sourceLineNo">715</span> String readOnProp = System.getProperty(propName);<a name="line.715"></a>
+<span class="sourceLineNo">716</span> if (readOnProp != null){<a name="line.716"></a>
+<span class="sourceLineNo">717</span> return Boolean.parseBoolean(readOnProp);<a name="line.717"></a>
+<span class="sourceLineNo">718</span> } else {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> return conf.getBoolean(propName, false);<a name="line.719"></a>
+<span class="sourceLineNo">720</span> }<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span><a name="line.722"></a>
+<span class="sourceLineNo">723</span> /** Enable the short circuit read, unless configured differently.<a name="line.723"></a>
+<span class="sourceLineNo">724</span> * Set both HBase and HDFS settings, including skipping the hdfs checksum checks.<a name="line.724"></a>
+<span class="sourceLineNo">725</span> */<a name="line.725"></a>
+<span class="sourceLineNo">726</span> private void enableShortCircuit() {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> if (isReadShortCircuitOn()) {<a name="line.727"></a>
+<span class="sourceLineNo">728</span> String curUser = System.getProperty("user.name");<a name="line.728"></a>
+<span class="sourceLineNo">729</span> LOG.info("read short circuit is ON for user " + curUser);<a name="line.729"></a>
+<span class="sourceLineNo">730</span> // read short circuit, for hdfs<a name="line.730"></a>
+<span class="sourceLineNo">731</span> conf.set("dfs.block.local-path-access.user", curUser);<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // read short circuit, for hbase<a name="line.732"></a>
+<span class="sourceLineNo">733</span> conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.733"></a>
+<span class="sourceLineNo">734</span> // Skip checking checksum, for the hdfs client and the datanode<a name="line.734"></a>
+<span class="sourceLineNo">735</span> conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a name="line.735"></a>
+<span class="sourceLineNo">736</span> } else {<a name="line.736"></a>
+<span class="sourceLineNo">737</span> LOG.info("read short circuit is OFF");<a name="line.737"></a>
+<span class="sourceLineNo">738</span> }<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> private String createDirAndSetProperty(final String relPath, String property) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> String path = getDataTestDir(relPath).toString();<a name="line.742"></a>
+<span class="sourceLineNo">743</span> System.setProperty(property, path);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> conf.set(property, path);<a name="line.744"></a>
+<span class="sourceLineNo">745</span> new File(path).mkdirs();<a name="line.745"></a>
+<span class="sourceLineNo">746</span> LOG.info("Setting " + property + " to " + path + " in system properties and HBase conf");<a name="line.746"></a>
+<span class="sourceLineNo">747</span> return path;<a name="line.747"></a>
+<span class="sourceLineNo">748</span> }<a name="line.748"></a>
+<span class="sourceLineNo">749</span><a name="line.749"></a>
+<span class="sourceLineNo">750</span> /**<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * Shuts down instance created by call to {@link #startMiniDFSCluster(int)}<a name="line.751"></a>
+<span class="sourceLineNo">752</span> * or does nothing.<a name="line.752"></a>
+<span class="sourceLineNo">753</span> * @throws IOException<a name="line.753"></a>
+<span class="sourceLineNo">754</span> */<a name="line.754"></a>
+<span class="sourceLineNo">755</span> public void shutdownMiniDFSCluster() throws IOException {<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (this.dfsCluster != null) {<a name="line.756"></a>
+<span class="sourceLineNo">757</span> // The below throws an exception per dn, AsynchronousCloseException.<a name="line.757"></a>
+<span class="sourceLineNo">758</span> this.dfsCluster.shutdown();<a name="line.758"></a>
+<span class="sourceLineNo">759</span> dfsCluster = null;<a name="line.759"></a>
+<span class="sourceLineNo">760</span> dataTestDirOnTestFS = null;<a name="line.760"></a>
+<span class="sourceLineNo">761</span> FSUtils.setFsDefault(this.conf, new Path("file:///"));<a name="line.761"></a>
+<span class="sourceLineNo">762</span> }<a name="line.762"></a>
+<span class="sourceLineNo">763</span> }<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> /**<a name="line.766"></a>
+<span class="sourceLineNo">767</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.767"></a>
+<span class="sourceLineNo">768</span> * @throws Exception<a name="line.768"></a>
+<span class="sourceLineNo">769</span> * @return Mini hbase cluster instance created.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.770"></a>
+<span class="sourceLineNo">771</span> */<a name="line.771"></a>
+<span class="sourceLineNo">772</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> return startMiniCluster(1, 1);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
<span class="sourceLineNo">775</span><a name="line.775"></a>
<span class="sourceLineNo">776</span> /**<a name="line.776"></a>
-<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.777"></a>
+<span class="sourceLineNo">777</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.777"></a>
<span class="sourceLineNo">778</span> * @throws Exception<a name="line.778"></a>
<span class="sourceLineNo">779</span> * @return Mini hbase cluster instance created.<a name="line.779"></a>
<span class="sourceLineNo">780</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.780"></a>
<span class="sourceLineNo">781</span> */<a name="line.781"></a>
-<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster() throws Exception {<a name="line.782"></a>
-<span class="sourceLineNo">783</span> return startMiniCluster(1, 1);<a name="line.783"></a>
+<span class="sourceLineNo">782</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.783"></a>
<span class="sourceLineNo">784</span> }<a name="line.784"></a>
<span class="sourceLineNo">785</span><a name="line.785"></a>
<span class="sourceLineNo">786</span> /**<a name="line.786"></a>
-<span class="sourceLineNo">787</span> * Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.<a name="line.787"></a>
-<span class="sourceLineNo">788</span> * @throws Exception<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * @return Mini hbase cluster instance created.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * @see {@link #shutdownMiniDFSCluster()}<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public MiniHBaseCluster startMiniCluster(boolean withWALDir) throws Exception {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> return startMiniCluster(1, 1, 1, null, null, null, false, withWALDir);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> }<a name="line.794"></a>
-<span class="sourceLineNo">795</span><a name="line.795"></a>
-<span class="sourceLineNo">796</span> /**<a name="line.796"></a>
-<span class="sourceLineNo">797</span> * Start up a minicluster of hbase, dfs, and zookeeper.<a name="line.797"></a>
-<span class="sourceLineNo">798</span> * Set the <code>create</code> flag to create root or data directory path or not<a name="line.798"></a>
-<span class="sourceLineNo">799</span> * (will overwrite if dir already exists)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> * @throws Exception<a name="line.800"></a>
-<span class="sourceLineNo">801</span> * @return Mini hbase clus
<TRUNCATED>