http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fb491705/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 5a1361f..8a84538 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
@@ -354,3779 +354,3782 @@
 <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>    // Every cluster is a local cluster 
until we start DFS<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    // Note that conf could be null, but 
this.conf will not be<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    String dataTestDir = 
getDataTestDir().toString();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    
this.conf.set("fs.defaultFS","file:///");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    this.conf.set(HConstants.HBASE_DIR, 
"file://" + dataTestDir);<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    LOG.debug("Setting {} to {}", 
HConstants.HBASE_DIR, dataTestDir);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    
this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>  }<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>   * @deprecated use {@link 
HBaseTestingUtility#HBaseTestingUtility()} instead<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * @return a normal 
HBaseTestingUtility<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   */<a name="line.361"></a>
-<span class="sourceLineNo">362</span>  @Deprecated<a name="line.362"></a>
-<span class="sourceLineNo">363</span>  public static HBaseTestingUtility 
createLocalHTU() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    return new HBaseTestingUtility();<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>  /**<a name="line.367"></a>
-<span class="sourceLineNo">368</span>   * @deprecated use {@link 
HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>   * @return a normal 
HBaseTestingUtility<a name="line.369"></a>
-<span class="sourceLineNo">370</span>   */<a name="line.370"></a>
-<span class="sourceLineNo">371</span>  @Deprecated<a name="line.371"></a>
-<span class="sourceLineNo">372</span>  public static HBaseTestingUtility 
createLocalHTU(Configuration c) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    return new HBaseTestingUtility(c);<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>  /**<a name="line.376"></a>
-<span class="sourceLineNo">377</span>   * Close both the region {@code r} and 
it's underlying WAL. For use in tests.<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   */<a name="line.378"></a>
-<span class="sourceLineNo">379</span>  public static void 
closeRegionAndWAL(final Region r) throws IOException {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    closeRegionAndWAL((HRegion)r);<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>  }<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>   * Close both the HRegion {@code r} and 
it's underlying WAL. For use in tests.<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   */<a name="line.385"></a>
-<span class="sourceLineNo">386</span>  public static void 
closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    if (r == null) return;<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>    r.close();<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    if (r.getWAL() == null) return;<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>    r.getWAL().close();<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>   * Returns this classes's instance of 
{@link Configuration}.  Be careful how<a name="line.394"></a>
-<span class="sourceLineNo">395</span>   * you use the returned Configuration 
since {@link Connection} instances<a name="line.395"></a>
-<span class="sourceLineNo">396</span>   * can be shared.  The Map of 
Connections is keyed by the Configuration.  If<a name="line.396"></a>
-<span class="sourceLineNo">397</span>   * say, a Connection was being used 
against a cluster that had been shutdown,<a name="line.397"></a>
-<span class="sourceLineNo">398</span>   * see {@link #shutdownMiniCluster()}, 
then the Connection will no longer<a name="line.398"></a>
-<span class="sourceLineNo">399</span>   * be wholesome.  Rather than use the 
return direct, its usually best to<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   * make a copy and use that.  Do<a 
name="line.400"></a>
-<span class="sourceLineNo">401</span>   * &lt;code&gt;Configuration c = new 
Configuration(INSTANCE.getConfiguration());&lt;/code&gt;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   * @return Instance of Configuration.<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>   */<a name="line.403"></a>
-<span class="sourceLineNo">404</span>  @Override<a name="line.404"></a>
-<span class="sourceLineNo">405</span>  public Configuration getConfiguration() 
{<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    return super.getConfiguration();<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>  public void 
setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    this.hbaseCluster = hbaseCluster;<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>  /**<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   * Home our data in a dir under {@link 
#DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   * Give it a random name so can have 
many concurrent tests running if<a name="line.415"></a>
-<span class="sourceLineNo">416</span>   * we need to.  It needs to amend the 
{@link #TEST_DIRECTORY_KEY}<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * System property, as it's what 
minidfscluster bases<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   * it data dir on.  Moding a System 
property is not the way to do concurrent<a name="line.418"></a>
-<span class="sourceLineNo">419</span>   * instances -- another instance could 
grab the temporary<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   * value unintentionally -- but not 
anything can do about it at moment;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   * single instance only is how the 
minidfscluster works.<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   *<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   * We also create the underlying 
directory for<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   *  hadoop.log.dir, 
mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>   *  in the conf, and as a system 
property for hadoop.tmp.dir<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   *<a name="line.426"></a>
-<span class="sourceLineNo">427</span>   * @return The calculated data test 
build directory, if newly-created.<a name="line.427"></a>
-<span class="sourceLineNo">428</span>   */<a name="line.428"></a>
-<span class="sourceLineNo">429</span>  @Override<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  protected Path setupDataTestDir() {<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>    Path testPath = 
super.setupDataTestDir();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    if (null == testPath) {<a 
name="line.432"></a>
-<span class="sourceLineNo">433</span>      return null;<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>    createSubDirAndSystemProperty(<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>      "hadoop.log.dir",<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>      testPath, "hadoop-log-dir");<a 
name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>    // This is defaulted in 
core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    //  we want our own value to ensure 
uniqueness on the same machine<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    createSubDirAndSystemProperty(<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>      "hadoop.tmp.dir",<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>      testPath, "hadoop-tmp-dir");<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span>    // Read and modified in 
org.apache.hadoop.mapred.MiniMRCluster<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    createSubDir(<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      "mapreduce.cluster.local.dir",<a 
name="line.448"></a>
-<span class="sourceLineNo">449</span>      testPath, "mapred-local-dir");<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>    return testPath;<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>  }<a name="line.452"></a>
+<span class="sourceLineNo">349</span>    // Save this for when setting default 
file:// breaks things<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    this.conf.set("original.defaultFS", 
this.conf.get("fs.defaultFS"));<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>    // Every cluster is a local cluster 
until we start DFS<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    // Note that conf could be null, but 
this.conf will not be<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    String dataTestDir = 
getDataTestDir().toString();<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    
this.conf.set("fs.defaultFS","file:///");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    this.conf.set(HConstants.HBASE_DIR, 
"file://" + dataTestDir);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    LOG.debug("Setting {} to {}", 
HConstants.HBASE_DIR, dataTestDir);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    
this.conf.setBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE,false);<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()} 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() {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    return new HBaseTestingUtility();<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>   * @deprecated use {@link 
HBaseTestingUtility#HBaseTestingUtility(Configuration)} instead<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>   * @return a normal 
HBaseTestingUtility<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   */<a name="line.373"></a>
+<span class="sourceLineNo">374</span>  @Deprecated<a name="line.374"></a>
+<span class="sourceLineNo">375</span>  public static HBaseTestingUtility 
createLocalHTU(Configuration c) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    return new HBaseTestingUtility(c);<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>   * Close both the region {@code r} and 
it's underlying WAL. For use in tests.<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   */<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  public static void 
closeRegionAndWAL(final Region r) throws IOException {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    closeRegionAndWAL((HRegion)r);<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>  /**<a name="line.386"></a>
+<span class="sourceLineNo">387</span>   * Close both the HRegion {@code r} and 
it's underlying WAL. For use in tests.<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   */<a name="line.388"></a>
+<span class="sourceLineNo">389</span>  public static void 
closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    if (r == null) return;<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>    r.close();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    if (r.getWAL() == null) return;<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>    r.getWAL().close();<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>  /**<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * Returns this classes's instance of 
{@link Configuration}.  Be careful how<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * you use the returned Configuration 
since {@link Connection} instances<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * can be shared.  The Map of 
Connections is keyed by the Configuration.  If<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   * say, a Connection was being used 
against a cluster that had been shutdown,<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   * see {@link #shutdownMiniCluster()}, 
then the Connection will no longer<a name="line.401"></a>
+<span class="sourceLineNo">402</span>   * be wholesome.  Rather than use the 
return direct, its usually best to<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   * make a copy and use that.  Do<a 
name="line.403"></a>
+<span class="sourceLineNo">404</span>   * &lt;code&gt;Configuration c = new 
Configuration(INSTANCE.getConfiguration());&lt;/code&gt;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>   * @return Instance of Configuration.<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>   */<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  @Override<a name="line.407"></a>
+<span class="sourceLineNo">408</span>  public Configuration getConfiguration() 
{<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    return super.getConfiguration();<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>  }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>  public void 
setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    this.hbaseCluster = hbaseCluster;<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>   * Home our data in a dir under {@link 
#DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.417"></a>
+<span class="sourceLineNo">418</span>   * Give it a random name so can have 
many concurrent tests running if<a name="line.418"></a>
+<span class="sourceLineNo">419</span>   * we need to.  It needs to amend the 
{@link #TEST_DIRECTORY_KEY}<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * System property, as it's what 
minidfscluster bases<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   * it data dir on.  Moding a System 
property is not the way to do concurrent<a name="line.421"></a>
+<span class="sourceLineNo">422</span>   * instances -- another instance could 
grab the temporary<a name="line.422"></a>
+<span class="sourceLineNo">423</span>   * value unintentionally -- but not 
anything can do about it at moment;<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   * single instance only is how the 
minidfscluster works.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>   *<a name="line.425"></a>
+<span class="sourceLineNo">426</span>   * We also create the underlying 
directory for<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   *  hadoop.log.dir, 
mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>   *  in the conf, and as a system 
property for hadoop.tmp.dir<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   *<a name="line.429"></a>
+<span class="sourceLineNo">430</span>   * @return The calculated data test 
build directory, if newly-created.<a name="line.430"></a>
+<span class="sourceLineNo">431</span>   */<a name="line.431"></a>
+<span class="sourceLineNo">432</span>  @Override<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  protected Path setupDataTestDir() {<a 
name="line.433"></a>
+<span class="sourceLineNo">434</span>    Path testPath = 
super.setupDataTestDir();<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    if (null == testPath) {<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>      return null;<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">439</span>    createSubDirAndSystemProperty(<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>      "hadoop.log.dir",<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span>      testPath, "hadoop-log-dir");<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span>    // This is defaulted in 
core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    //  we want our own value to ensure 
uniqueness on the same machine<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    createSubDirAndSystemProperty(<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>      "hadoop.tmp.dir",<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>      testPath, "hadoop-tmp-dir");<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Read and modified in 
org.apache.hadoop.mapred.MiniMRCluster<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    createSubDir(<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      "mapreduce.cluster.local.dir",<a 
name="line.451"></a>
+<span class="sourceLineNo">452</span>      testPath, "mapred-local-dir");<a 
name="line.452"></a>
 <span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span>  private void 
createSubDirAndSystemProperty(<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    String propertyName, Path parent, 
String subDirName){<a name="line.455"></a>
+<span class="sourceLineNo">454</span>    return testPath;<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>    String sysValue = 
System.getProperty(propertyName);<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    if (sysValue != null) {<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>      // There is already a value set. So 
we do nothing but hope<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      //  that there will be no 
conflicts<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      
LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span>        sysValue + " so I do NOT create 
it in " + parent);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      String confValue = 
conf.get(propertyName);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      if (confValue != null &amp;&amp; 
!confValue.endsWith(sysValue)){<a name="line.465"></a>
-<span class="sourceLineNo">466</span>       LOG.warn(<a name="line.466"></a>
-<span class="sourceLineNo">467</span>         propertyName + " property value 
differs in configuration and system: "+<a name="line.467"></a>
-<span class="sourceLineNo">468</span>         "Configuration="+confValue+" 
while System="+sysValue+<a name="line.468"></a>
-<span class="sourceLineNo">469</span>         " Erasing configuration value by 
system value."<a name="line.469"></a>
-<span class="sourceLineNo">470</span>       );<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      }<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      conf.set(propertyName, sysValue);<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>    } else {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      // Ok, it's not set, so we create 
it as a subdirectory<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      createSubDir(propertyName, parent, 
subDirName);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      System.setProperty(propertyName, 
conf.get(propertyName));<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>   * @return Where to write test data on 
the test filesystem; Returns working directory<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   * for the test filesystem by default<a 
name="line.482"></a>
-<span class="sourceLineNo">483</span>   * @see #setupDataTestDirOnTestFS()<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>   * @see #getTestFileSystem()<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>   */<a name="line.485"></a>
-<span class="sourceLineNo">486</span>  private Path getBaseTestDirOnTestFS() 
throws IOException {<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    FileSystem fs = 
getTestFileSystem();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    return new 
Path(fs.getWorkingDirectory(), "test-data");<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span>  /**<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   * @return META table descriptor<a 
name="line.492"></a>
-<span class="sourceLineNo">493</span>   * @deprecated since 2.0 version and 
will be removed in 3.0 version.<a name="line.493"></a>
-<span class="sourceLineNo">494</span>   *             use {@link 
#getMetaTableDescriptorBuilder()}<a name="line.494"></a>
-<span class="sourceLineNo">495</span>   */<a name="line.495"></a>
-<span class="sourceLineNo">496</span>  @Deprecated<a name="line.496"></a>
-<span class="sourceLineNo">497</span>  public HTableDescriptor 
getMetaTableDescriptor() {<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    return new 
ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<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>  /**<a name="line.501"></a>
-<span class="sourceLineNo">502</span>   * @return META table descriptor<a 
name="line.502"></a>
-<span class="sourceLineNo">503</span>   */<a name="line.503"></a>
-<span class="sourceLineNo">504</span>  public TableDescriptorBuilder 
getMetaTableDescriptorBuilder() {<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    try {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>      return 
FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a 
name="line.506"></a>
-<span class="sourceLineNo">507</span>    } catch (IOException e) {<a 
name="line.507"></a>
-<span class="sourceLineNo">508</span>      throw new RuntimeException("Unable 
to create META table descriptor", e);<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>  /**<a name="line.512"></a>
-<span class="sourceLineNo">513</span>   * Returns a Path in the test 
filesystem, obtained from {@link #getTestFileSystem()}<a name="line.513"></a>
-<span class="sourceLineNo">514</span>   * to write temporary test data. Call 
this method after setting up the mini dfs cluster<a name="line.514"></a>
-<span class="sourceLineNo">515</span>   * if the test relies on it.<a 
name="line.515"></a>
-<span class="sourceLineNo">516</span>   * @return a unique path in the test 
filesystem<a name="line.516"></a>
-<span class="sourceLineNo">517</span>   */<a name="line.517"></a>
-<span class="sourceLineNo">518</span>  public Path getDataTestDirOnTestFS() 
throws IOException {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    if (dataTestDirOnTestFS == null) {<a 
name="line.519"></a>
-<span class="sourceLineNo">520</span>      setupDataTestDirOnTestFS();<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>    }<a name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    return dataTestDirOnTestFS;<a 
name="line.523"></a>
-<span class="sourceLineNo">524</span>  }<a name="line.524"></a>
+<span class="sourceLineNo">457</span>  private void 
createSubDirAndSystemProperty(<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    String propertyName, Path parent, 
String subDirName){<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>    String sysValue = 
System.getProperty(propertyName);<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span>    if (sysValue != null) {<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>      // There is already a value set. So 
we do nothing but hope<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      //  that there will be no 
conflicts<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      
LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>        sysValue + " so I do NOT create 
it in " + parent);<a name="line.466"></a>
+<span class="sourceLineNo">467</span>      String confValue = 
conf.get(propertyName);<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      if (confValue != null &amp;&amp; 
!confValue.endsWith(sysValue)){<a name="line.468"></a>
+<span class="sourceLineNo">469</span>       LOG.warn(<a name="line.469"></a>
+<span class="sourceLineNo">470</span>         propertyName + " property value 
differs in configuration and system: "+<a name="line.470"></a>
+<span class="sourceLineNo">471</span>         "Configuration="+confValue+" 
while System="+sysValue+<a name="line.471"></a>
+<span class="sourceLineNo">472</span>         " Erasing configuration value by 
system value."<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>      conf.set(propertyName, sysValue);<a 
name="line.475"></a>
+<span class="sourceLineNo">476</span>    } else {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      // Ok, it's not set, so we create 
it as a subdirectory<a name="line.477"></a>
+<span class="sourceLineNo">478</span>      createSubDir(propertyName, parent, 
subDirName);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      System.setProperty(propertyName, 
conf.get(propertyName));<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><a name="line.482"></a>
+<span class="sourceLineNo">483</span>  /**<a name="line.483"></a>
+<span class="sourceLineNo">484</span>   * @return Where to write test data on 
the test filesystem; Returns working directory<a name="line.484"></a>
+<span class="sourceLineNo">485</span>   * for the test filesystem by default<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>   * @see #setupDataTestDirOnTestFS()<a 
name="line.486"></a>
+<span class="sourceLineNo">487</span>   * @see #getTestFileSystem()<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>   */<a name="line.488"></a>
+<span class="sourceLineNo">489</span>  private Path getBaseTestDirOnTestFS() 
throws IOException {<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    FileSystem fs = 
getTestFileSystem();<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    return new 
Path(fs.getWorkingDirectory(), "test-data");<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>   * @return META table descriptor<a 
name="line.495"></a>
+<span class="sourceLineNo">496</span>   * @deprecated since 2.0 version and 
will be removed in 3.0 version.<a name="line.496"></a>
+<span class="sourceLineNo">497</span>   *             use {@link 
#getMetaTableDescriptorBuilder()}<a name="line.497"></a>
+<span class="sourceLineNo">498</span>   */<a name="line.498"></a>
+<span class="sourceLineNo">499</span>  @Deprecated<a name="line.499"></a>
+<span class="sourceLineNo">500</span>  public HTableDescriptor 
getMetaTableDescriptor() {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    return new 
ImmutableHTableDescriptor(getMetaTableDescriptorBuilder().build());<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>  /**<a name="line.504"></a>
+<span class="sourceLineNo">505</span>   * @return META table descriptor<a 
name="line.505"></a>
+<span class="sourceLineNo">506</span>   */<a name="line.506"></a>
+<span class="sourceLineNo">507</span>  public TableDescriptorBuilder 
getMetaTableDescriptorBuilder() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    try {<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      return 
FSTableDescriptors.createMetaTableDescriptorBuilder(conf);<a 
name="line.509"></a>
+<span class="sourceLineNo">510</span>    } catch (IOException e) {<a 
name="line.510"></a>
+<span class="sourceLineNo">511</span>      throw new RuntimeException("Unable 
to create META table descriptor", e);<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    }<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>   * Returns a Path in the test 
filesystem, obtained from {@link #getTestFileSystem()}<a name="line.516"></a>
+<span class="sourceLineNo">517</span>   * to write temporary test data. Call 
this method after setting up the mini dfs cluster<a name="line.517"></a>
+<span class="sourceLineNo">518</span>   * if the test relies on it.<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>   * @return a unique path in the test 
filesystem<a name="line.519"></a>
+<span class="sourceLineNo">520</span>   */<a name="line.520"></a>
+<span class="sourceLineNo">521</span>  public Path getDataTestDirOnTestFS() 
throws IOException {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    if (dataTestDirOnTestFS == null) {<a 
name="line.522"></a>
+<span class="sourceLineNo">523</span>      setupDataTestDirOnTestFS();<a 
name="line.523"></a>
+<span class="sourceLineNo">524</span>    }<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>   * Returns a Path in the test 
filesystem, obtained from {@link #getTestFileSystem()}<a name="line.527"></a>
-<span class="sourceLineNo">528</span>   * to write temporary test data. Call 
this method after setting up the mini dfs cluster<a name="line.528"></a>
-<span class="sourceLineNo">529</span>   * if the test relies on it.<a 
name="line.529"></a>
-<span class="sourceLineNo">530</span>   * @return a unique path in the test 
filesystem<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * @param subdirName name of the subdir 
to create under the base test dir<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  public Path 
getDataTestDirOnTestFS(final String subdirName) throws IOException {<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>    return new 
Path(getDataTestDirOnTestFS(), subdirName);<a name="line.534"></a>
-<span class="sourceLineNo">535</span>  }<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>   * Sets up a path in test filesystem to 
be used by tests.<a name="line.538"></a>
-<span class="sourceLineNo">539</span>   * Creates a new directory if not 
already setup.<a name="line.539"></a>
-<span class="sourceLineNo">540</span>   */<a name="line.540"></a>
-<span class="sourceLineNo">541</span>  private void setupDataTestDirOnTestFS() 
throws IOException {<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    if (dataTestDirOnTestFS != null) {<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>      LOG.warn("Data test on test fs dir 
already setup in "<a name="line.543"></a>
-<span class="sourceLineNo">544</span>          + 
dataTestDirOnTestFS.toString());<a name="line.544"></a>
-<span class="sourceLineNo">545</span>      return;<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    dataTestDirOnTestFS = 
getNewDataTestDirOnTestFS();<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>  /**<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   * Sets up a new path in test 
filesystem to be used by tests.<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>  private Path 
getNewDataTestDirOnTestFS() throws IOException {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    //The file system can be either 
local, mini dfs, or if the configuration<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    //is supplied externally, it can be 
an external cluster FS. If it is a local<a name="line.555"></a>
-<span class="sourceLineNo">556</span>    //file system, the tests should use 
getBaseTestDir, otherwise, we can use<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    //the working directory, and create a 
unique sub dir there<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    FileSystem fs = 
getTestFileSystem();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    Path newDataTestDir;<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>    String randomStr = 
UUID.randomUUID().toString();<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    if 
(fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme()))
 {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      newDataTestDir = new 
Path(getDataTestDir(), randomStr);<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      File dataTestDir = new 
File(newDataTestDir.toString());<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      if (deleteOnExit()) 
dataTestDir.deleteOnExit();<a name="line.564"></a>
-<span class="sourceLineNo">565</span>    } else {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>      Path base = 
getBaseTestDirOnTestFS();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      newDataTestDir = new Path(base, 
randomStr);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      if (deleteOnExit()) 
fs.deleteOnExit(newDataTestDir);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    }<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    return newDataTestDir;<a 
name="line.570"></a>
-<span class="sourceLineNo">571</span>  }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span>  /**<a name="line.573"></a>
-<span class="sourceLineNo">574</span>   * Cleans the test data directory on 
the test filesystem.<a name="line.574"></a>
-<span class="sourceLineNo">575</span>   * @return True if we removed the test 
dirs<a name="line.575"></a>
-<span class="sourceLineNo">576</span>   * @throws IOException<a 
name="line.576"></a>
-<span class="sourceLineNo">577</span>   */<a name="line.577"></a>
-<span class="sourceLineNo">578</span>  public boolean 
cleanupDataTestDirOnTestFS() throws IOException {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>    boolean ret = 
getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    if (ret)<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      dataTestDirOnTestFS = null;<a 
name="line.581"></a>
-<span class="sourceLineNo">582</span>    return ret;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>  }<a name="line.583"></a>
-<span class="sourceLineNo">584</span><a name="line.584"></a>
-<span class="sourceLineNo">585</span>  /**<a name="line.585"></a>
-<span class="sourceLineNo">586</span>   * Cleans a subdirectory under the test 
data directory on the test filesystem.<a name="line.586"></a>
-<span class="sourceLineNo">587</span>   * @return True if we removed child<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>   * @throws IOException<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>   */<a name="line.589"></a>
-<span class="sourceLineNo">590</span>  public boolean 
cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>    Path cpath = 
getDataTestDirOnTestFS(subdirName);<a name="line.591"></a>
-<span class="sourceLineNo">592</span>    return 
getTestFileSystem().delete(cpath, true);<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  }<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span>  /**<a name="line.595"></a>
-<span class="sourceLineNo">596</span>   * Start a minidfscluster.<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>   * @param servers How many DNs to 
start.<a name="line.597"></a>
-<span class="sourceLineNo">598</span>   * @throws Exception<a 
name="line.598"></a>
-<span class="sourceLineNo">599</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.599"></a>
-<span class="sourceLineNo">600</span>   * @return The mini dfs cluster 
created.<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   */<a name="line.601"></a>
-<span class="sourceLineNo">602</span>  public MiniDFSCluster 
startMiniDFSCluster(int servers) throws Exception {<a name="line.602"></a>
-<span class="sourceLineNo">603</span>    return startMiniDFSCluster(servers, 
null);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>  }<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>   * Start a minidfscluster.<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>   * This is useful if you want to run 
datanode on distinct hosts for things<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * like HDFS block location 
verification.<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   * If you start MiniDFSCluster without 
host names, all instances of the<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   * datanodes will have the same host 
name.<a name="line.611"></a>
-<span class="sourceLineNo">612</span>   * @param hosts hostnames DNs to run 
on.<a name="line.612"></a>
-<span class="sourceLineNo">613</span>   * @throws Exception<a 
name="line.613"></a>
-<span class="sourceLineNo">614</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.614"></a>
-<span class="sourceLineNo">615</span>   * @return The mini dfs cluster 
created.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>   */<a name="line.616"></a>
-<span class="sourceLineNo">617</span>  public MiniDFSCluster 
startMiniDFSCluster(final String hosts[])<a name="line.617"></a>
-<span class="sourceLineNo">618</span>  throws Exception {<a 
name="line.618"></a>
-<span class="sourceLineNo">619</span>    if ( hosts != null &amp;&amp; 
hosts.length != 0) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      return 
startMiniDFSCluster(hosts.length, hosts);<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    } else {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      return startMiniDFSCluster(1, 
null);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
-<span class="sourceLineNo">624</span>  }<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>   * Start a minidfscluster.<a 
name="line.627"></a>
-<span class="sourceLineNo">628</span>   * Can only create one.<a 
name="line.628"></a>
-<span class="sourceLineNo">629</span>   * @param servers How many DNs to 
start.<a name="line.629"></a>
-<span class="sourceLineNo">630</span>   * @param hosts hostnames DNs to run 
on.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * @throws Exception<a 
name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.632"></a>
-<span class="sourceLineNo">633</span>   * @return The mini dfs cluster 
created.<a name="line.633"></a>
-<span class="sourceLineNo">634</span>   */<a name="line.634"></a>
-<span class="sourceLineNo">635</span>  public MiniDFSCluster 
startMiniDFSCluster(int servers, final String hosts[])<a name="line.635"></a>
-<span class="sourceLineNo">636</span>  throws Exception {<a 
name="line.636"></a>
-<span class="sourceLineNo">637</span>    return startMiniDFSCluster(servers, 
null, hosts);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>  }<a name="line.638"></a>
-<span class="sourceLineNo">639</span><a name="line.639"></a>
-<span class="sourceLineNo">640</span>  private void setFs() throws IOException 
{<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    if(this.dfsCluster == null){<a 
name="line.641"></a>
-<span class="sourceLineNo">642</span>      LOG.info("Skipping setting fs 
because dfsCluster is null");<a name="line.642"></a>
-<span class="sourceLineNo">643</span>      return;<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    }<a name="line.644"></a>
-<span class="sourceLineNo">645</span>    FileSystem fs = 
this.dfsCluster.getFileSystem();<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    FSUtils.setFsDefault(this.conf, new 
Path(fs.getUri()));<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span>    // re-enable this check with dfs<a 
name="line.648"></a>
-<span class="sourceLineNo">649</span>    
conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a 
name="line.649"></a>
-<span class="sourceLineNo">650</span>  }<a name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>  public MiniDFSCluster 
startMiniDFSCluster(int servers, final  String racks[], String hosts[])<a 
name="line.652"></a>
-<span class="sourceLineNo">653</span>      throws Exception {<a 
name="line.653"></a>
-<span class="sourceLineNo">654</span>    createDirsAndSetProperties();<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>    
EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a 
name="line.655"></a>
-<span class="sourceLineNo">656</span><a name="line.656"></a>
-<span class="sourceLineNo">657</span>    // Error level to skip some warnings 
specific to the minicluster. See HBASE-4709<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    
org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a
 name="line.658"></a>
-<span class="sourceLineNo">659</span>        
setLevel(org.apache.log4j.Level.ERROR);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    
org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a
 name="line.660"></a>
-<span class="sourceLineNo">661</span>        
setLevel(org.apache.log4j.Level.ERROR);<a name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span>    TraceUtil.initTracer(conf);<a 
name="line.663"></a>
-<span class="sourceLineNo">664</span><a name="line.664"></a>
-<span class="sourceLineNo">665</span>    this.dfsCluster = new 
MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.665"></a>
-<span class="sourceLineNo">666</span>        true, null, racks, hosts, 
null);<a name="line.666"></a>
+<span class="sourceLineNo">526</span>    return dataTestDirOnTestFS;<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span>  }<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>   * Returns a Path in the test 
filesystem, obtained from {@link #getTestFileSystem()}<a name="line.530"></a>
+<span class="sourceLineNo">531</span>   * to write temporary test data. Call 
this method after setting up the mini dfs cluster<a name="line.531"></a>
+<span class="sourceLineNo">532</span>   * if the test relies on it.<a 
name="line.532"></a>
+<span class="sourceLineNo">533</span>   * @return a unique path in the test 
filesystem<a name="line.533"></a>
+<span class="sourceLineNo">534</span>   * @param subdirName name of the subdir 
to create under the base test dir<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   */<a name="line.535"></a>
+<span class="sourceLineNo">536</span>  public Path 
getDataTestDirOnTestFS(final String subdirName) throws IOException {<a 
name="line.536"></a>
+<span class="sourceLineNo">537</span>    return new 
Path(getDataTestDirOnTestFS(), subdirName);<a name="line.537"></a>
+<span class="sourceLineNo">538</span>  }<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>   * Sets up a path in test filesystem to 
be used by tests.<a name="line.541"></a>
+<span class="sourceLineNo">542</span>   * Creates a new directory if not 
already setup.<a name="line.542"></a>
+<span class="sourceLineNo">543</span>   */<a name="line.543"></a>
+<span class="sourceLineNo">544</span>  private void setupDataTestDirOnTestFS() 
throws IOException {<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    if (dataTestDirOnTestFS != null) {<a 
name="line.545"></a>
+<span class="sourceLineNo">546</span>      LOG.warn("Data test on test fs dir 
already setup in "<a name="line.546"></a>
+<span class="sourceLineNo">547</span>          + 
dataTestDirOnTestFS.toString());<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      return;<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    }<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    dataTestDirOnTestFS = 
getNewDataTestDirOnTestFS();<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>   * Sets up a new path in test 
filesystem to be used by tests.<a name="line.554"></a>
+<span class="sourceLineNo">555</span>   */<a name="line.555"></a>
+<span class="sourceLineNo">556</span>  private Path 
getNewDataTestDirOnTestFS() throws IOException {<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    //The file system can be either 
local, mini dfs, or if the configuration<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    //is supplied externally, it can be 
an external cluster FS. If it is a local<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    //file system, the tests should use 
getBaseTestDir, otherwise, we can use<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    //the working directory, and create a 
unique sub dir there<a name="line.560"></a>
+<span class="sourceLineNo">561</span>    FileSystem fs = 
getTestFileSystem();<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    Path newDataTestDir;<a 
name="line.562"></a>
+<span class="sourceLineNo">563</span>    String randomStr = 
UUID.randomUUID().toString();<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    if 
(fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme()))
 {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>      newDataTestDir = new 
Path(getDataTestDir(), randomStr);<a name="line.565"></a>
+<span class="sourceLineNo">566</span>      File dataTestDir = new 
File(newDataTestDir.toString());<a name="line.566"></a>
+<span class="sourceLineNo">567</span>      if (deleteOnExit()) 
dataTestDir.deleteOnExit();<a name="line.567"></a>
+<span class="sourceLineNo">568</span>    } else {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      Path base = 
getBaseTestDirOnTestFS();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>      newDataTestDir = new Path(base, 
randomStr);<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      if (deleteOnExit()) 
fs.deleteOnExit(newDataTestDir);<a name="line.571"></a>
+<span class="sourceLineNo">572</span>    }<a name="line.572"></a>
+<span class="sourceLineNo">573</span>    return newDataTestDir;<a 
name="line.573"></a>
+<span class="sourceLineNo">574</span>  }<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>   * Cleans the test data directory on 
the test filesystem.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>   * @return True if we removed the test 
dirs<a name="line.578"></a>
+<span class="sourceLineNo">579</span>   * @throws IOException<a 
name="line.579"></a>
+<span class="sourceLineNo">580</span>   */<a name="line.580"></a>
+<span class="sourceLineNo">581</span>  public boolean 
cleanupDataTestDirOnTestFS() throws IOException {<a name="line.581"></a>
+<span class="sourceLineNo">582</span>    boolean ret = 
getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.582"></a>
+<span class="sourceLineNo">583</span>    if (ret)<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      dataTestDirOnTestFS = null;<a 
name="line.584"></a>
+<span class="sourceLineNo">585</span>    return ret;<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>   * Cleans a subdirectory under the test 
data directory on the test filesystem.<a name="line.589"></a>
+<span class="sourceLineNo">590</span>   * @return True if we removed child<a 
name="line.590"></a>
+<span class="sourceLineNo">591</span>   * @throws IOException<a 
name="line.591"></a>
+<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
+<span class="sourceLineNo">593</span>  public boolean 
cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a 
name="line.593"></a>
+<span class="sourceLineNo">594</span>    Path cpath = 
getDataTestDirOnTestFS(subdirName);<a name="line.594"></a>
+<span class="sourceLineNo">595</span>    return 
getTestFileSystem().delete(cpath, true);<a name="line.595"></a>
+<span class="sourceLineNo">596</span>  }<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>   * Start a minidfscluster.<a 
name="line.599"></a>
+<span class="sourceLineNo">600</span>   * @param servers How many DNs to 
start.<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   * @throws Exception<a 
name="line.601"></a>
+<span class="sourceLineNo">602</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.602"></a>
+<span class="sourceLineNo">603</span>   * @return The mini dfs cluster 
created.<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   */<a name="line.604"></a>
+<span class="sourceLineNo">605</span>  public MiniDFSCluster 
startMiniDFSCluster(int servers) throws Exception {<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    return startMiniDFSCluster(servers, 
null);<a name="line.606"></a>
+<span class="sourceLineNo">607</span>  }<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>   * Start a minidfscluster.<a 
name="line.610"></a>
+<span class="sourceLineNo">611</span>   * This is useful if you want to run 
datanode on distinct hosts for things<a name="line.611"></a>
+<span class="sourceLineNo">612</span>   * like HDFS block location 
verification.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>   * If you start MiniDFSCluster without 
host names, all instances of the<a name="line.613"></a>
+<span class="sourceLineNo">614</span>   * datanodes will have the same host 
name.<a name="line.614"></a>
+<span class="sourceLineNo">615</span>   * @param hosts hostnames DNs to run 
on.<a name="line.615"></a>
+<span class="sourceLineNo">616</span>   * @throws Exception<a 
name="line.616"></a>
+<span class="sourceLineNo">617</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   * @return The mini dfs cluster 
created.<a name="line.618"></a>
+<span class="sourceLineNo">619</span>   */<a name="line.619"></a>
+<span class="sourceLineNo">620</span>  public MiniDFSCluster 
startMiniDFSCluster(final String hosts[])<a name="line.620"></a>
+<span class="sourceLineNo">621</span>  throws Exception {<a 
name="line.621"></a>
+<span class="sourceLineNo">622</span>    if ( hosts != null &amp;&amp; 
hosts.length != 0) {<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      return 
startMiniDFSCluster(hosts.length, hosts);<a name="line.623"></a>
+<span class="sourceLineNo">624</span>    } else {<a name="line.624"></a>
+<span class="sourceLineNo">625</span>      return startMiniDFSCluster(1, 
null);<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><a name="line.628"></a>
+<span class="sourceLineNo">629</span>  /**<a name="line.629"></a>
+<span class="sourceLineNo">630</span>   * Start a minidfscluster.<a 
name="line.630"></a>
+<span class="sourceLineNo">631</span>   * Can only create one.<a 
name="line.631"></a>
+<span class="sourceLineNo">632</span>   * @param servers How many DNs to 
start.<a name="line.632"></a>
+<span class="sourceLineNo">633</span>   * @param hosts hostnames DNs to run 
on.<a name="line.633"></a>
+<span class="sourceLineNo">634</span>   * @throws Exception<a 
name="line.634"></a>
+<span class="sourceLineNo">635</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.635"></a>
+<span class="sourceLineNo">636</span>   * @return The mini dfs cluster 
created.<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   */<a name="line.637"></a>
+<span class="sourceLineNo">638</span>  public MiniDFSCluster 
startMiniDFSCluster(int servers, final String hosts[])<a name="line.638"></a>
+<span class="sourceLineNo">639</span>  throws Exception {<a 
name="line.639"></a>
+<span class="sourceLineNo">640</span>    return startMiniDFSCluster(servers, 
null, hosts);<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>  private void setFs() throws IOException 
{<a name="line.643"></a>
+<span class="sourceLineNo">644</span>    if(this.dfsCluster == null){<a 
name="line.644"></a>
+<span class="sourceLineNo">645</span>      LOG.info("Skipping setting fs 
because dfsCluster is null");<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      return;<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    }<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    FileSystem fs = 
this.dfsCluster.getFileSystem();<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    FSUtils.setFsDefault(this.conf, new 
Path(fs.getUri()));<a name="line.649"></a>
+<span class="sourceLineNo">650</span><a name="line.650"></a>
+<span class="sourceLineNo">651</span>    // re-enable this check with dfs<a 
name="line.651"></a>
+<span class="sourceLineNo">652</span>    
conf.unset(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE);<a 
name="line.652"></a>
+<span class="sourceLineNo">653</span>  }<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span>  public MiniDFSCluster 
startMiniDFSCluster(int servers, final  String racks[], String hosts[])<a 
name="line.655"></a>
+<span class="sourceLineNo">656</span>      throws Exception {<a 
name="line.656"></a>
+<span class="sourceLineNo">657</span>    createDirsAndSetProperties();<a 
name="line.657"></a>
+<span class="sourceLineNo">658</span>    
EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a 
name="line.658"></a>
+<span class="sourceLineNo">659</span><a name="line.659"></a>
+<span class="sourceLineNo">660</span>    // Error level to skip some warnings 
specific to the minicluster. See HBASE-4709<a name="line.660"></a>
+<span class="sourceLineNo">661</span>    
org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a
 name="line.661"></a>
+<span class="sourceLineNo">662</span>        
setLevel(org.apache.log4j.Level.ERROR);<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    
org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a
 name="line.663"></a>
+<span class="sourceLineNo">664</span>        
setLevel(org.apache.log4j.Level.ERROR);<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span>    TraceUtil.initTracer(conf);<a 
name="line.666"></a>
 <span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span>    // Set this just-started cluster as 
our filesystem.<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    setFs();<a name="line.669"></a>
+<span class="sourceLineNo">668</span>    this.dfsCluster = new 
MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.668"></a>
+<span class="sourceLineNo">669</span>        true, null, racks, hosts, 
null);<a name="line.669"></a>
 <span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>    // Wait for the cluster to be totally 
up<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    this.dfsCluster.waitClusterUp();<a 
name="line.672"></a>
+<span class="sourceLineNo">671</span>    // Set this just-started cluster as 
our filesystem.<a name="line.671"></a>
+<span class="sourceLineNo">672</span>    setFs();<a name="line.672"></a>
 <span class="sourceLineNo">673</span><a name="line.673"></a>
-<span class="sourceLineNo">674</span>    //reset the test directory for test 
file system<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    dataTestDirOnTestFS = null;<a 
name="line.675"></a>
-<span class="sourceLineNo">676</span>    String dataTestDir = 
getDataTestDir().toString();<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    conf.set(HConstants.HBASE_DIR, 
dataTestDir);<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    LOG.debug("Setting {} to {}", 
HConstants.HBASE_DIR, dataTestDir);<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>    return this.dfsCluster;<a 
name="line.680"></a>
-<span class="sourceLineNo">681</span>  }<a name="line.681"></a>
+<span class="sourceLineNo">674</span>    // Wait for the cluster to be totally 
up<a name="line.674"></a>
+<span class="sourceLineNo">675</span>    this.dfsCluster.waitClusterUp();<a 
name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span>    //reset the test directory for test 
file system<a name="line.677"></a>
+<span class="sourceLineNo">678</span>    dataTestDirOnTestFS = null;<a 
name="line.678"></a>
+<span class="sourceLineNo">679</span>    String dataTestDir = 
getDataTestDir().toString();<a name="line.679"></a>
+<span class="sourceLineNo">680</span>    conf.set(HConstants.HBASE_DIR, 
dataTestDir);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>    LOG.debug("Setting {} to {}", 
HConstants.HBASE_DIR, dataTestDir);<a name="line.681"></a>
 <span class="sourceLineNo">682</span><a name="line.682"></a>
-<span class="sourceLineNo">683</span>  public MiniDFSCluster 
startMiniDFSClusterForTestWAL(int namenodePort) throws IOException {<a 
name="line.683"></a>
-<span class="sourceLineNo">684</span>    createDirsAndSetProperties();<a 
name="line.684"></a>
-<span class="sourceLineNo">685</span>    dfsCluster = new 
MiniDFSCluster(namenodePort, conf, 5, false, true, true, null,<a 
name="line.685"></a>
-<span class="sourceLineNo">686</span>        null, null, null);<a 
name="line.686"></a>
-<span class="sourceLineNo">687</span>    return dfsCluster;<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>  }<a name="line.688"></a>
-<span class="sourceLineNo">689</span><a name="line.689"></a>
-<span class="sourceLineNo">690</span>  /** This is used before starting HDFS 
and map-reduce mini-clusters */<a name="line.690"></a>
-<span class="sourceLineNo">691</span>  private void 
createDirsAndSetProperties() throws IOException {<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    setupClusterTestDir();<a 
name="line.692"></a>
-<span class="sourceLineNo">693</span>    conf.set(TEST_DIRECTORY_KEY, 
clusterTestDir.getPath());<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    
System.setProperty(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a 
name="line.694"></a>
-<span class="sourceLineNo">695</span>    createDirAndSetProperty("cache_data", 
"test.cache.data");<a name="line.695"></a>
-<span class="sourceLineNo">696</span>    createDirAndSetProperty("hadoop_tmp", 
"hadoop.tmp.dir");<a name="line.696"></a>
-<span class="sourceLineNo">697</span>    hadoopLogDir = 
createDirAndSetProperty("hadoop_logs", "hadoop.log.dir");<a name="line.697"></a>
-<span class="sourceLineNo">698</span>    
createDirAndSetProperty("mapred_local", "mapreduce.cluster.local.dir");<a 
name="line.698"></a>
-<span class="sourceLineNo">699</span>    
createDirAndSetProperty("mapred_temp", "mapreduce.cluster.temp.dir");<a 
name="line.699"></a>
-<span class="sourceLineNo">700</span>    enableShortCircuit();<a 
name="line.700"></a>
-<span class="sourceLineNo">701</span><a name="line.701"></a>
-<span class="sourceLineNo">702</span>    Path root = 
getDataTestDirOnTestFS("hadoop");<a name="line.702"></a>
-<span class="sourceLineNo">703</span>    
conf.set(MapreduceTestingShim.getMROutputDirProp(),<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      new Path(root, 
"mapred-output-dir").toString());<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    
conf.set("mapreduce.jobtracker.system.dir", new Path(root, 
"mapred-system-dir").toString());<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    
conf.set("mapreduce.jobtracker.staging.root.dir",<a name="line.706"></a>
-<span class="sourceLineNo">707</span>      new Path(root, 
"mapreduce-jobtracker-staging-root-dir").toString());<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    conf.set("mapreduce.job.working.dir", 
new Path(root, "mapred-working-dir").toString());<a name="line.708"></a>
-<span class="sourceLineNo">709</span>    
conf.set("yarn.app.mapreduce.am.staging-dir",<a name="line.709"></a>
-<span class="sourceLineNo">710</span>      new Path(root, 
"mapreduce-am-staging-root-dir").toString());<a name="line.710"></a>
-<span class="sourceLineNo">711</span>  }<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span>  /**<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   *  Get the HBase setting for 
dfs.client.read.shortcircuit from the conf or a system property.<a 
name="line.715"></a>
-<span class="sourceLineNo">716</span>   *  This allows to specify this 
parameter on the command line.<a name="line.716"></a>
-<span class="sourceLineNo">717</span>   *   If not set, default is true.<a 
name="line.717"></a>
-<span class="sourceLineNo">718</span>   */<a name="line.718"></a>
-<span class="sourceLineNo">719</span>  public boolean 
isReadShortCircuitOn(){<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    final String propName = 
"hbase.tests.use.shortcircuit.reads";<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    String readOnProp = 
System.getProperty(propName);<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    if (readOnProp != null){<a 
name="line.722"></a>
-<span class="sourceLineNo">723</span>      return  
Boolean.parseBoolean(readOnProp);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>    } else {<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      return conf.getBoolean(propName, 
false);<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    }<a name="line.726"></a>
-<span class="sourceLineNo">727</span>  }<a name="line.727"></a>
-<span class="sourceLineNo">728</span><a name="line.728"></a>
-<span class="sourceLineNo">729</span>  /** Enable the short circuit read, 
unless configured differently.<a name="line.729"></a>
-<span class="sourceLineNo">730</span>   * Set both HBase and HDFS settings, 
including skipping the hdfs checksum checks.<a name="line.730"></a>
-<span class="sourceLineNo">731</span>   */<a name="line.731"></a>
-<span class="sourceLineNo">732</span>  private void enableShortCircuit() {<a 
name="line.732"></a>
-<span class="sourceLineNo">733</span>    if (isReadShortCircuitOn()) {<a 
name="line.733"></a>
-<span class="sourceLineNo">734</span>      String curUser = 
System.getProperty("user.name");<a name="line.734"></a>
-<span class="sourceLineNo">735</span>      LOG.info("read short circuit is ON 
for user " + curUser);<a name="line.735"></a>
-<span class="sourceLineNo">736</span>      // read short circuit, for hdfs<a 
name="line.736"></a>
-<span class="sourceLineNo">737</span>      
conf.set("dfs.block.local-path-access.user", curUser);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>      // read short circuit, for hbase<a 
name="line.738"></a>
-<span class="sourceLineNo">739</span>      
conf.setBoolean("dfs.client.read.shortcircuit", true);<a name="line.739"></a>
-<span class="sourceLineNo">740</span>      // Skip checking checksum, for the 
hdfs client and the datanode<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      
conf.setBoolean("dfs.client.read.shortcircuit.skip.checksum", true);<a 
name="line.741"></a>
-<span class="sourceLineNo">742</span>    } else {<a name="line.742"></a>
-<span class="sourceLineNo">743</span>      LOG.info("read short circuit is 
OFF");<a name="line.743"></a>
-<span class="sourceLineNo">744</span>    }<a name="line.744"></a>
-<span class="sourceLineNo">745</span>  }<a name="line.745"></a>
-<span class="sourceLineNo">746</span><a name="line.746"></a>
-<span class="sourceLineNo">747</span>  private String 
createDirAndSetProperty(final String relPath, String property) {<a 
name="line.747"></a>
-<span class="sourceLineNo">748</span>    String path = 
getDataTestDir(relPath).toString();<a name="line.748"></a>
-<span class="sourceLineNo">749</span>    System.setProperty(property, path);<a 
name="line.749"></a>
-<span class="sourceLineNo">750</span>    conf.set(property, path);<a 
name="line.750"></a>
-<span class="sourceLineNo">751</span>    new File(path).mkdirs();<a 
name="line.751"></a>
-<span class="sourceLineNo">752</span>    LOG.info("Setting " + property + " to 
" + path + " in system properties and HBase conf");<a name="line.752"></a>
-<span class="sourceLineNo">753</span>    return path;<a name="line.753"></a>
-<span class="sourceLineNo">754</span>  }<a name="line.754"></a>
-<span class="sourceLineNo">755</span><a name="line.755"></a>
-<span class="sourceLineNo">756</span>  /**<a name="line.756"></a>
-<span class="sourceLineNo">757</span>   * Shuts down instance created by call 
to {@link #startMiniDFSCluster(int)}<a name="line.757"></a>
-<span class="sourceLineNo">758</span>   * or does nothing.<a 
name="line.758"></a>
-<span class="sourceLineNo">759</span>   * @throws IOException<a 
name="line.759"></a>
-<span class="sourceLineNo">760</span>   */<a name="line.760"></a>
-<span class="sourceLineNo">761</span>  public void shutdownMiniDFSCluster() 
throws IOException {<a name="line.761"></a>
-<span class="sourceLineNo">762</span>    if (this.dfsCluster != null) {<a 
name="line.762"></a>
-<span class="sourceLineNo">763</span>      // The below throws an exception 
per dn, AsynchronousCloseException.<a name="line.763"></a>
-<span class="sourceLineNo">764</span>      this.dfsCluster.shutdown();<a 
name="line.764"></a>
-<span class="sourceLineNo">765</span>      dfsCluster = null;<a 
name="line.765"></a>
-<span class="sourceLineNo">766</span>      dataTestDirOnTestFS = null;<a 
name="line.766"></a>
-<span class="sourceLineNo">767</span>      FSUtils.setFsDefault(this.conf, new 
Path("file:///"));<a name="line.767"></a>
-<span class="sourceLineNo">768</span>    }<a name="line.768"></a>
-<span class="sourceLineNo">769</span>  }<a name="line.769"></a>
-<span class="sourceLineNo">770</span><a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span>  /**<a name="line.772"></a>
-<span class="sourceLineNo">773</span>   * Start up a minicluster of hbase, 
dfs, and zookeeper.<a name="line.773"></a>
-<span class="sourceLineNo">774</span>   * @throws Exception<a 
name="line.774"></a>
-<span class="sourceLineNo">775</span>   * @return Mini hbase cluster instance 
created.<a name="line.775"></a>
-<span class="sourceLineNo">776</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.776"></a>
-<span class="sourceLineNo">777</span>   */<a name="line.777"></a>
-<span class="sourceLineNo">778</span>  public MiniHBaseCluster 
startMiniCluster() throws Exception {<a name="line.778"></a>
-<span class="sourceLineNo">779</span>    return startMiniCluster(1, 1);<a 
name="line.779"></a>
-<span class="sourceLineNo">780</span>  }<a name="line.780"></a>
-<span class="sourceLineNo">781</span><a name="line.781"></a>
-<span class="sourceLineNo">782</span>  /**<a name="line.782"></a>
-<span class="sourceLineNo">783</span>   * Start up a minicluster of hbase, 
dfs, and zookeeper where WAL's walDir is created separately.<a 
name="line.783"></a>
-<span class="sourceLineNo">784</span>   * @throws Exception<a 
name="line.784"></a>
-<span class="sourceLineNo">785</span>   * @return Mini hbase cluster instance 
created.<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  public MiniHBaseCluster 
startMiniCluster(boolean withWALDir) throws Exception {<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    return startMiniCluster(1, 1, 1, 
null, null, null, false, withWALDir);<a name="line.789"></a>
-<span class="sourceLineNo">790</span>  }<a name="line.790"></a>
-<span class="sourceLineNo">791</span><a name="line.791"></a>
-<span class="sourceLineNo">792</span>  /**<a name="line.792"></a>
-<span class="sourceLineNo">793</span>   * Start up a minicluster of hbase, 
dfs, and zookeeper.<a name="line.793"></a>
-<span class="sourceLineNo">794</span>   * Set the 
&lt;code&gt;create&lt;/code&gt; flag to create root or data directory path or 
not<a name="line.794"></a>
-<span class="sourceLineNo">795</span>   * (will overwrite if dir already 
exists)<a name="line.795"></a>
-<span class="sourceLineNo">796</span>   * @throws Exception<a 
name="line.796"></a>
-<span class="sourceLineNo">797</span>   * @return Mini hbase cluster instance 
created.<a name="line.797"></a>
-<span class="sourceLineNo">798</span>   * @see {@link 
#shutdownMiniDFSCluster()}<a name="line.798"></a>
-<span class="sourceLineNo">799</span>   */<a name="line.799"></a>
-<span class="sourceLineNo">800</span>  public MiniHBaseCluster 
startMiniCluster(final int numSlaves, boolean create)<a name="line.800"></a>
-<span class="sourceLineNo">801</span>  throws Exception {<a 
name="line.801"></a>
-<span class="sourceLineNo">802</span>    return startMiniCluster(1, numSlaves, 
create);<a name="line.802"></a>
-<span class="sourceLineNo">803</span>  }<a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span>  /**<a name="line.805"></a>
-<span class="sourceLineNo">806</span>   * Start up a minicluster of hbase, 
optionally dfs, and zookeeper.<a name="line.806"></a>
-<span class="sourceLineNo">807</span>   * Modifies Configuration.  Homes the 
cluster data directory under a random<a name="line.807"></a>
-<span class="sourceLineNo">808</span>   * subdirectory in a directory under 
System property test.build.data.<a name="line.808"></a>
-<span class="sourceLineNo">809</span>   * Directory is cleaned up on exit.<a 
name="line.809"></a>
-<span class="sourceLineNo">810</span>   * @param numSlaves Number of slaves to 
start up.  We'll start this many<a name="line.810"></a>
-<span class="sourceLineNo">811</span>   * datanodes and regionservers.  If 
numSlaves is &gt; 1, then make sure<a name="line.811"></a>
-<span class="sourceLineNo">812</span>   * hbase.regionserver.info.port is -1 
(i.e. no ui per regionserver) otherwise<a name="line.812"></a>
-<span class="sourceLineNo">813</span>   * bind errors.<a name="line.813"></a>
-<span class="sourceLineNo">814</span>   * @throws Exception<a 
name="line.814"></a>
-<span class="sourceLineNo">815</span>   * @see {@link 
#shutdownMiniCluster()}<a name="line.815"></a>
-<span class="sourceLineNo">816</span>   * @return Mini hbase cluster instance 
created.<a name="line.816"></a>
-<span class="sourceLineNo">817</span>   */<a name="line.817"></a>
-<span class="sourceLineNo">818</span>  public MiniHBaseCluster 
startMiniCluster(final int numSlaves)<a name="line.818"></a>
-<span class="sourceLineNo">819</span>  throws Exception {<a 
name="line.819"></a>
-<span class="sourceLineNo">820</span>    return startMiniCluster(1, numSlaves, 
false);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>  }<a name="line.821"></a>
-<span class="sourceLineNo">822</span><a name="line.822"></a>
-<span class="sourceLineNo">823</span>  public MiniHBaseCluster 
startMiniCluster(final int numSlaves, boolean create, boolean withWALDir)<a 
name="line.823"></a>
-<span class="sourceLineNo">824</span>          throws Exception {<a 
name="line.824"></a>
-<span class="sourceLineNo">825</span>    return startMiniCluster(1, numSlaves, 
numSlaves, null, null, null, create, withWALDir);<a name="line.825"></a>
-<span class="sourceLineNo">826</span>  }<a name="line.826"></a>
-<span class="sourceLineNo">827</span><a name="line.827"></a>
-<span class="sourceLineNo">828</span>  /**<a name="line.828"></a>
-<span class="sourceLineNo">829</span>   * Start minicluster. Whether to create 
a new root or data dir path even if such a path<a name="line.829"></a>
-<span class="sourceLineNo">830</span>   * has been created earlier is decided 
based on flag &lt;code&gt;create&lt;/code&gt;<a name="line.830"></a>
-<span class="sourceLineNo">831</span>   * @throws Exception<a 
name="line.831"></a>
-<span class="sourceLineNo">832</span>   * @see {@link 
#shutdownMiniCluster()}<a name="line.832"></a>
-<span class="sourceLineNo">833</span>   * @return Mini hbase cluster instance 
created.<a name="line.833"></a>
-<span class="sourceLineNo">834</span>   */<a name="line.834"></a>
-<span class="sourceLineNo">835</span>  public MiniHBaseCluster 
startMiniCluster(final int numMasters,<a name="line.835"></a>
-<span class="sourceLineNo">836</span>      final int numSlaves, boolean 
create)<a name="line.836"></a>
-<span class="sourceLineNo">837</span>    throws Exception {<a 
name="line.837"></a>
-<span class="sourceLineNo">838</span>      return startMiniCluster(numMasters, 
numSlaves, null, create);<a name="line.838"></a>
-<span class="sourceLineNo">839</span>  }<a name="line.839"></a>
-<span class="sourceLineNo">840</span><a name="line.840"></a>
-<span class="sourceLineNo">841</span>  /**<a name="line.841"></a>
-<span class="sourceLineNo">842</span>   * start minicluster<a 
name="line.842"></a>
-<span class="sourceLineNo">843</span>   * @throws Exception<a 
name="line.843"></a>
-<span class="sourceLineNo">844</span>   * @see {@link 
#shutdownMiniCluster()}<a name="line.844"></a>
-<span class="sourceLineNo">845</span>   * @return Mini hbase cluster instance 
created.<a name="line.845"></a>
-<span class="sourceLineNo">846</span>   */<a name="line.846"></a>
-<span class="sourceLineNo">847</span>  public MiniHBaseCluster 
startMiniCluster(final int numMasters,<a name="line.847"></a>
-<span class="sourceLineNo">848</span>    final int numSlaves)<a 
name="line.848"></a>
-<span class="sourceLineNo">849</span>  throws Exception {<a 
name="line.849"></a>
-<span class="sourceLineNo">850</span>    return startMiniCluster(numMasters, 
numSlaves, null, false);<a name="line.850"></a>
-<span class="sourceLineNo">851</span>  }<a name="line.851"></a>
-<span class="sourceLineNo">852</span><a name="line.852"></a>
-<span class="sourceLineNo">853</span>  public MiniHBaseCluster 
startMiniCluster(final int numMasters,<a name="line.853"></a>
-<span class="sourceLineNo">854</span>      final int numSlaves, final String[] 
dataNodeHosts, boolean create)<a name="line.854"></a>
-<span class="sourceLineNo">855</span>      throws Exception {<a 
name="line.855"></a>
-<span class="sourceLineNo">856</span>    return startMiniCluster(numMasters, 
numSlaves, numSlaves, dataNodeHosts,<a name="line.856"></a>
-<span class="sourceLineNo">857</span>        null, null, create, false);<a 
name="line.857"></a>
-<span class="sourceLineNo">858</span>  }<a name="line.858"></a>
-<span class="sourceLineNo">859</span><a name="line.859"></a>
-<span class="sourceLineNo">860</span>  /**<a name="line.860"></a>
-<span class="sourceLineNo">861</span>   * Start up a minicluster of hbase, 
optionally dfs, and zookeeper.<a name="line.861"></a>
-<span class="sourceLineNo">862</span>   * Modifies Configuration.  Homes the 
cluster data directory under a random<a name="line.862"></a>
-<span class="sourceLineNo">863</span>   * subdirectory in a directory under 
System property test.build.data.<a name="line.863"></a>
-<span class="sourceLineNo">864</span>   * Directory is cleaned up on exit.<a 
name="line.864"></a>
-<span class="sourceLineNo">865</span>   * @param numMasters Number of masters 
to start up.  We'll start this many<a name="line.865"></a>
-<span class="sourceLineNo">866</span>   * hbase masters.  If numMasters &gt; 
1, you can find the active/primary master<a name="line.866"></a>
-<span class="sourceLineNo">867</span>   * with {@link 
MiniHBaseCluster#getMaster()}.<a name="line.867"></a>
-<span class="sourceLineNo">868</span>   * @param numSlaves Number of slaves to 
start up.  We'll start this many<a name="line.868"></a>
-<span class="sourceLineNo">869</span>   * regionservers. If dataNodeHosts == 
null, this also indicates the number of<a name="line.869"></a>
-<span class="sourceLineNo">870</span>   * datanodes to start. If dataNodeHosts 
!= null, the number of datanodes is<a name="line.870"></a>
-<span class="sourceLineNo">871</span>   * based on dataNodeHosts.length.<a 
name="line.871"></a>
-<span class="sourceLineNo">872</span>   * If numSlaves is &gt; 1, then make 
sure<a name="line.872"></a>
-<span class="sourceLineNo">873</span>   * hbase.regionserver.info.port is -1 
(i.e. no ui per regionserver) otherwise<a name="line.873"></a>
-<span class="sourceLineNo">874</span>   * bind errors.<a name="line.874"></a>
-<span class="sourceLineNo">875</span>   * @param dataNodeHosts hostnames DNs 
to run on.<a name="line.875"></a>
-<span class="sourceLineNo">876</span>   * This is useful if you want to run 
datanode on distinct hosts for things<a name="line.876"></a>
-<span class="sourceLineNo">877</span>   * like HDFS block location 
verification.<a name="line.877"></a>
-<span class="sourceLineNo">878</span>   * If you start MiniDFSCluster without 
host names,<a name="line.878"></a>
-<span class="sourceLineNo">879</span>   * all instances of the datanodes will 
have the same host name.<a name="line.879"></a>
-<span class="sourceLineNo">880</span>   * @throws Exception<a 
name="line.880"></a>
-<span class="sourceLineNo">881</span>   * @see {@link 
#shutdownMiniCluster()}<a name="line.881"></a>
-<span class="sourceLineNo">882</span>   * @return Mini hbase cluster instance 
created.<a name="line.882"></a>
-<span class="sourceLineNo">883</span>   */<a name="line.883"></a>
-<span class="sourceLineNo">884</span>  public MiniHBaseCluster 
startMiniCluster(final int numMasters,<a name="line.884"></a>
-<span class="sourceLineNo">885</span>      final int numSlaves, final String[] 
dataNodeHosts) throws Exception {<a name="line.885"></a>
-<span class="sourceLineNo">886</span>    return startMiniCluster(numMasters, 
numSlaves, numSlaves, dataNodeHosts,<a name="line.886"></a>
-<span class="sourceLineNo">887</span>        null, null);<a 
name="line.887"></a>
-<span class="sourceLineNo">888</span>  }<a name="line.888"></a>
-<span class="sourceLineNo">889</span><a name="line.889"></a>
-<span class="sourceLineNo">890</span>  /**<a name="line.890"></a>
-<span class="sourceLineNo">891</span>   * Same as {@link 
#startMiniCluster(int, int)}, but with custom number of datanodes.<a 
name="line.891"></a>
-<span class="sourceLineNo">892</span>   * @param numDataNodes Number of data 
nodes.<a name="line.892"></a>
-<span class="sourceLineNo">893</span>   */<a name="line.893"></a>
-<span class="sourceLineNo">894</span>  public MiniHBaseCluster 
startMiniCluster(final int numMasters,<a name="line.894"></a>
-<span class="sourceLineNo">895</span>      final int numSlaves, final int 
numDataNodes) throws Exception {<a name="line.895"></a>
-<span class="sourceLineNo">896</span>    return startMiniCluster(numMasters, 
numSlaves, numDataNodes, null, null, null);<a name="line.896"></a>
-<span class="sourceLineNo">897</span>  }<a name="line.897"></a>
-<span class="sourceLineNo">898</span><a name="line.898"></a>
-<span class="sourceLineNo">899</span>  /**<a name="line.899"></a>
-<span class="sourceLineNo">900</span>   * Start up a minicluster of hbase, 
optionally dfs, and zookeeper.<a name="line.900"></a>
-<span class="sourceLineNo">901</span>   * Modifies Configuration.  Homes the 
cluster data directory under a random<a name="line.901"></a>
-<span class="sourceLineNo">902</span>   * subdirectory in a directory under 
System property test.build.data.<a name="line.902"></a>
-<span class="sourceLineNo">903</span>   * Directory is cleaned up on exit.<a 
name="line.903"></a>
-<span class="sourceLineNo">904</span>   * @param numMasters Number of masters 
to start up.  We'll start this many<a name="line.904"></a>
-<span class="sourceLineNo">905</span>   * hbase masters.  If numMasters &gt; 
1, you can find the active/primary master<a name="line.905"></a>
-<span class="sourceLineNo">906</span>   * with {@link 
MiniHBaseCluster#getMaster()}.<a name="line.906"></a>
-<span class="sourceLineNo">907</span>   * @param numSlaves Number of slaves to 
start up.  We'll start this many<a name="line.907"></a>
-<span class="sourceLineNo">908</span>   * regionservers. If dataNodeHosts == 
null, this also indicates the number of<a name="line.908"></a>
-<span class="sourceLineNo">909</span>   * datanodes to start. If dataNodeHosts 
!= null, the number of datanodes is<a name="line.909"></a>
-<span class="sourceLineNo">910</span>   * based on dataNodeHosts.length.<a 
name="line.910"></a>
-<span class="sourceLineNo">911</span>   * If numSlaves is &gt; 1, then make 
sure<a name="line.911"></a>
-<span class="sourceLineNo">912</span>   * hbase.regionserver.info.port is -1 
(i.e. no ui per regionserver) otherwise<a name="line.912"></a>
-<span class="sourceLineNo">913</span>   * bind errors.<a name="line.913"></a>
-<span class="sourceLineNo">914</span>   * @param dataNodeHosts hostnames DNs 
to run on.<a name="line.914"></a>
-<span class="sourceLineNo">915</span>   * This is useful if you want to run 
datanode on distinct hosts for things<a name="line.915"></a>
-<span class="sourceLineNo">916</span>   * like HDFS block location 
verification.<a name="line.916"></a>
-<span class="sourceLineNo">917</span>   * If you start MiniDFSCluster without 
host names,<a name="line.917"></a>
-<span class="sourceLineNo">918</span>   * all instances of the datanodes will 
have the same host name.<a name="line.918"></a>
-<span class="s

<TRUNCATED>

Reply via email to