hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [27/51] [partial] hbase-site git commit: Published site at .
Date Tue, 15 Aug 2017 15:06:43 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/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 692d186..11fd08a 100644
--- a/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
+++ b/testapidocs/src-html/org/apache/hadoop/hbase/HBaseTestingUtility.html
@@ -224,4223 +224,4205 @@
 <span class="sourceLineNo">216</span>  /** Filesystem URI used for map-reduce mini-cluster setup */<a name="line.216"></a>
 <span class="sourceLineNo">217</span>  private static String FS_URI;<a name="line.217"></a>
 <span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>  /** Compression algorithms to use in parameterized JUnit 4 tests */<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  public static final List&lt;Object[]&gt; COMPRESSION_ALGORITHMS_PARAMETERIZED =<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    Arrays.asList(new Object[][] {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      { Compression.Algorithm.NONE },<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      { Compression.Algorithm.GZ }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    });<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>  /** This is for unit tests parameterized with a two booleans. */<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  public static final List&lt;Object[]&gt; BOOLEAN_PARAMETERIZED =<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      Arrays.asList(new Object[][] {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>          {false},<a name="line.229"></a>
-<span class="sourceLineNo">230</span>          {true}<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>  /** This is for unit tests parameterized with a single boolean. */<a name="line.233"></a>
-<span class="sourceLineNo">234</span>  public static final List&lt;Object[]&gt; MEMSTORETS_TAGS_PARAMETRIZED = memStoreTSAndTagsCombination();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  /** Compression algorithms to use in testing */<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public static final Compression.Algorithm[] COMPRESSION_ALGORITHMS ={<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      Compression.Algorithm.NONE, Compression.Algorithm.GZ<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    };<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>  /**<a name="line.240"></a>
-<span class="sourceLineNo">241</span>   * Checks to see if a specific port is available.<a name="line.241"></a>
-<span class="sourceLineNo">242</span>   *<a name="line.242"></a>
-<span class="sourceLineNo">243</span>   * @param port the port number to check for availability<a name="line.243"></a>
-<span class="sourceLineNo">244</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if the port is available, or &lt;tt&gt;false&lt;/tt&gt; if not<a name="line.244"></a>
-<span class="sourceLineNo">245</span>   */<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  public static boolean available(int port) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    ServerSocket ss = null;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    DatagramSocket ds = null;<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    try {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      ss = new ServerSocket(port);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      ss.setReuseAddress(true);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      ds = new DatagramSocket(port);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      ds.setReuseAddress(true);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      return true;<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    } catch (IOException e) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      // Do nothing<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    } finally {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      if (ds != null) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        ds.close();<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span>      if (ss != null) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        try {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>          ss.close();<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        } catch (IOException e) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>          /* should not be thrown */<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>    }<a name="line.269"></a>
+<span class="sourceLineNo">219</span>  /** This is for unit tests parameterized with a single boolean. */<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  public static final List&lt;Object[]&gt; MEMSTORETS_TAGS_PARAMETRIZED = memStoreTSAndTagsCombination();<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>  /**<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   * Checks to see if a specific port is available.<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   *<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * @param port the port number to check for availability<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   * @return &lt;tt&gt;true&lt;/tt&gt; if the port is available, or &lt;tt&gt;false&lt;/tt&gt; if not<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   */<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  public static boolean available(int port) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    ServerSocket ss = null;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    DatagramSocket ds = null;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    try {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      ss = new ServerSocket(port);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      ss.setReuseAddress(true);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      ds = new DatagramSocket(port);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      ds.setReuseAddress(true);<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      return true;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    } catch (IOException e) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      // Do nothing<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    } finally {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      if (ds != null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        ds.close();<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>      if (ss != null) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        try {<a name="line.245"></a>
+<span class="sourceLineNo">246</span>          ss.close();<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        } catch (IOException e) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>          /* should not be thrown */<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        }<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>    return false;<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>   * Create all combinations of Bloom filters and compression algorithms for<a name="line.257"></a>
+<span class="sourceLineNo">258</span>   * testing.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  private static List&lt;Object[]&gt; bloomAndCompressionCombinations() {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    List&lt;Object[]&gt; configurations = new ArrayList&lt;&gt;();<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    for (Compression.Algorithm comprAlgo :<a name="line.262"></a>
+<span class="sourceLineNo">263</span>         HBaseCommonTestingUtility.COMPRESSION_ALGORITHMS) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      for (BloomType bloomType : BloomType.values()) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>        configurations.add(new Object[] { comprAlgo, bloomType });<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>    return Collections.unmodifiableList(configurations);<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
 <span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span>    return false;<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>   * Create all combinations of Bloom filters and compression algorithms for<a name="line.275"></a>
-<span class="sourceLineNo">276</span>   * testing.<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   */<a name="line.277"></a>
-<span class="sourceLineNo">278</span>  private static List&lt;Object[]&gt; bloomAndCompressionCombinations() {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    List&lt;Object[]&gt; configurations = new ArrayList&lt;&gt;();<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    for (Compression.Algorithm comprAlgo :<a name="line.280"></a>
-<span class="sourceLineNo">281</span>         HBaseTestingUtility.COMPRESSION_ALGORITHMS) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      for (BloomType bloomType : BloomType.values()) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        configurations.add(new Object[] { comprAlgo, bloomType });<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      }<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    return Collections.unmodifiableList(configurations);<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>  /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span>   * Create combination of memstoreTS and tags<a name="line.290"></a>
-<span class="sourceLineNo">291</span>   */<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  private static List&lt;Object[]&gt; memStoreTSAndTagsCombination() {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    List&lt;Object[]&gt; configurations = new ArrayList&lt;&gt;();<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    configurations.add(new Object[] { false, false });<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    configurations.add(new Object[] { false, true });<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    configurations.add(new Object[] { true, false });<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    configurations.add(new Object[] { true, true });<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    return Collections.unmodifiableList(configurations);<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>  public static List&lt;Object[]&gt; memStoreTSTagsAndOffheapCombination() {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    List&lt;Object[]&gt; configurations = new ArrayList&lt;&gt;();<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    configurations.add(new Object[] { false, false, true });<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    configurations.add(new Object[] { false, false, false });<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    configurations.add(new Object[] { false, true, true });<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    configurations.add(new Object[] { false, true, false });<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    configurations.add(new Object[] { true, false, true });<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    configurations.add(new Object[] { true, false, false });<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    configurations.add(new Object[] { true, true, true });<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    configurations.add(new Object[] { true, true, false });<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    return Collections.unmodifiableList(configurations);<a name="line.311"></a>
-<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>  public static final Collection&lt;Object[]&gt; BLOOM_AND_COMPRESSION_COMBINATIONS =<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      bloomAndCompressionCombinations();<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>  public HBaseTestingUtility() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    this(HBaseConfiguration.create());<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>  public HBaseTestingUtility(Configuration conf) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    super(conf);<a name="line.322"></a>
+<span class="sourceLineNo">271</span>  /**<a name="line.271"></a>
+<span class="sourceLineNo">272</span>   * Create combination of memstoreTS and tags<a name="line.272"></a>
+<span class="sourceLineNo">273</span>   */<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  private static List&lt;Object[]&gt; memStoreTSAndTagsCombination() {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    List&lt;Object[]&gt; configurations = new ArrayList&lt;&gt;();<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    configurations.add(new Object[] { false, false });<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    configurations.add(new Object[] { false, true });<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    configurations.add(new Object[] { true, false });<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    configurations.add(new Object[] { true, true });<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    return Collections.unmodifiableList(configurations);<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>  public static List&lt;Object[]&gt; memStoreTSTagsAndOffheapCombination() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    List&lt;Object[]&gt; configurations = new ArrayList&lt;&gt;();<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    configurations.add(new Object[] { false, false, true });<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    configurations.add(new Object[] { false, false, false });<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    configurations.add(new Object[] { false, true, true });<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    configurations.add(new Object[] { false, true, false });<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    configurations.add(new Object[] { true, false, true });<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    configurations.add(new Object[] { true, false, false });<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    configurations.add(new Object[] { true, true, true });<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    configurations.add(new Object[] { true, true, false });<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    return Collections.unmodifiableList(configurations);<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>  public static final Collection&lt;Object[]&gt; BLOOM_AND_COMPRESSION_COMBINATIONS =<a name="line.296"></a>
+<span class="sourceLineNo">297</span>      bloomAndCompressionCombinations();<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>  public HBaseTestingUtility() {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    this(HBaseConfiguration.create());<a name="line.300"></a>
+<span class="sourceLineNo">301</span>  }<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span>  public HBaseTestingUtility(Configuration conf) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    super(conf);<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    // a hbase checksum verification failure will cause unit tests to fail<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>    // prevent contention for ports if other hbase thread(s) already running<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    if (conf != null) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.311"></a>
+<span class="sourceLineNo">312</span>              == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        LOG.debug("Config property " + HConstants.MASTER_INFO_PORT + " changed to -1");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.316"></a>
+<span class="sourceLineNo">317</span>              == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        LOG.debug("Config property " + HConstants.REGIONSERVER_PORT + " changed to -1");<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><a name="line.323"></a>
-<span class="sourceLineNo">324</span>    // a hbase checksum verification failure will cause unit tests to fail<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    ChecksumUtil.generateExceptionForChecksumFailureForTest(true);<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>    // prevent contention for ports if other hbase thread(s) already running<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    if (conf != null) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      if (conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT)<a name="line.329"></a>
-<span class="sourceLineNo">330</span>              == HConstants.DEFAULT_MASTER_INFOPORT) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        conf.setInt(HConstants.MASTER_INFO_PORT, -1);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>        LOG.debug("Config property " + HConstants.MASTER_INFO_PORT + " changed to -1");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      if (conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT)<a name="line.334"></a>
-<span class="sourceLineNo">335</span>              == HConstants.DEFAULT_REGIONSERVER_PORT) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>        conf.setInt(HConstants.REGIONSERVER_PORT, -1);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        LOG.debug("Config property " + HConstants.REGIONSERVER_PORT + " changed to -1");<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>   * Create an HBaseTestingUtility where all tmp files are written to the local test data dir.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>   * It is needed to properly base FSUtil.getRootDirs so that they drop temp files in the proper<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * test dir.  Use this when you aren't using an Mini HDFS cluster.<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   * @return HBaseTestingUtility that use local fs for temp files.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   */<a name="line.347"></a>
-<span class="sourceLineNo">348</span>  public static HBaseTestingUtility createLocalHTU() {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    Configuration c = HBaseConfiguration.create();<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    return createLocalHTU(c);<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>  /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span>   * Create an HBaseTestingUtility where all tmp files are written to the local test data dir.<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * It is needed to properly base FSUtil.getRootDirs so that they drop temp files in the proper<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * test dir.  Use this when you aren't using an Mini HDFS cluster.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * @param c Configuration (will be modified)<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   * @return HBaseTestingUtility that use local fs for temp files.<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   */<a name="line.359"></a>
-<span class="sourceLineNo">360</span>  public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    HBaseTestingUtility htu = new HBaseTestingUtility(c);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    String dataTestDir = htu.getDataTestDir().toString();<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    htu.getConfiguration().set("fs.defaultFS","file:///");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    htu.getConfiguration().set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    LOG.debug("Setting " + HConstants.HBASE_DIR + " to " + dataTestDir);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    htu.localMode = true;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    return htu;<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">324</span>  /**<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   * Create an HBaseTestingUtility where all tmp files are written to the local test data dir.<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   * It is needed to properly base FSUtil.getRootDirs so that they drop temp files in the proper<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   * test dir.  Use this when you aren't using an Mini HDFS cluster.<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * @return HBaseTestingUtility that use local fs for temp files.<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   */<a name="line.329"></a>
+<span class="sourceLineNo">330</span>  public static HBaseTestingUtility createLocalHTU() {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    Configuration c = HBaseConfiguration.create();<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    return createLocalHTU(c);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  }<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>   * Create an HBaseTestingUtility where all tmp files are written to the local test data dir.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   * It is needed to properly base FSUtil.getRootDirs so that they drop temp files in the proper<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   * test dir.  Use this when you aren't using an Mini HDFS cluster.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   * @param c Configuration (will be modified)<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   * @return HBaseTestingUtility that use local fs for temp files.<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
+<span class="sourceLineNo">342</span>  public static HBaseTestingUtility createLocalHTU(Configuration c) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    HBaseTestingUtility htu = new HBaseTestingUtility(c);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    String dataTestDir = htu.getDataTestDir().toString();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    htu.getConfiguration().set("fs.defaultFS","file:///");<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    htu.getConfiguration().set(HConstants.HBASE_DIR, "file://" + dataTestDir);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    LOG.debug("Setting " + HConstants.HBASE_DIR + " to " + dataTestDir);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    htu.localMode = true;<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    return htu;<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>   * Close both the region {@code r} and it's underlying WAL. For use in tests.<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   */<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  public static void closeRegionAndWAL(final Region r) throws IOException {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    closeRegionAndWAL((HRegion)r);<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>  /**<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * Close both the HRegion {@code r} and it's underlying WAL. For use in tests.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   */<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  public static void closeRegionAndWAL(final HRegion r) throws IOException {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    if (r == null) return;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    r.close();<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    if (r.getWAL() == null) return;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    r.getWAL().close();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>  }<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>   * Returns this classes's instance of {@link Configuration}.  Be careful how<a name="line.370"></a>
+<span class="sourceLineNo">371</span>   * you use the returned Configuration since {@link Connection} instances<a name="line.371"></a>
+<span class="sourceLineNo">372</span>   * can be shared.  The Map of Connections is keyed by the Configuration.  If<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   * say, a Connection was being used against a cluster that had been shutdown,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   * see {@link #shutdownMiniCluster()}, then the Connection will no longer<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   * be wholesome.  Rather than use the return direct, its usually best to<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   * make a copy and use that.  Do<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   * &lt;code&gt;Configuration c = new Configuration(INSTANCE.getConfiguration());&lt;/code&gt;<a name="line.377"></a>
+<span class="sourceLineNo">378</span>   * @return Instance of Configuration.<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>   * 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>   * &lt;code&gt;Configuration c = new Configuration(INSTANCE.getConfiguration());&lt;/code&gt;<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">380</span>  @Override<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  public Configuration getConfiguration() {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    return super.getConfiguration();<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>  public void setHBaseCluster(HBaseCluster hbaseCluster) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    this.hbaseCluster = hbaseCluster;<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>  /**<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * Home our data in a dir under {@link #DEFAULT_BASE_TEST_DIRECTORY}.<a name="line.390"></a>
+<span class="sourceLineNo">391</span>   * Give it a random name so can have many concurrent tests running if<a name="line.391"></a>
+<span class="sourceLineNo">392</span>   * we need to.  It needs to amend the {@link #TEST_DIRECTORY_KEY}<a name="line.392"></a>
+<span class="sourceLineNo">393</span>   * System property, as it's what minidfscluster bases<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   * it data dir on.  Moding a System property is not the way to do concurrent<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   * instances -- another instance could grab the temporary<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * value unintentionally -- but not anything can do about it at moment;<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * single instance only is how the minidfscluster works.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   *<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * We also create the underlying directory for<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   *  hadoop.log.dir, mapreduce.cluster.local.dir and hadoop.tmp.dir, and set the values<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   *  in the conf, and as a system property for hadoop.tmp.dir<a name="line.401"></a>
+<span class="sourceLineNo">402</span>   *<a name="line.402"></a>
+<span class="sourceLineNo">403</span>   * @return The calculated data test build directory, if newly-created.<a name="line.403"></a>
+<span class="sourceLineNo">404</span>   */<a name="line.404"></a>
+<span class="sourceLineNo">405</span>  @Override<a name="line.405"></a>
+<span class="sourceLineNo">406</span>  protected Path setupDataTestDir() {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    Path testPath = super.setupDataTestDir();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    if (null == testPath) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      return null;<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>    createSubDirAndSystemProperty(<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      "hadoop.log.dir",<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      testPath, "hadoop-log-dir");<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span>    // This is defaulted in core-default.xml to /tmp/hadoop-${user.name}, but<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    //  we want our own value to ensure uniqueness on the same machine<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    createSubDirAndSystemProperty(<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      "hadoop.tmp.dir",<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      testPath, "hadoop-tmp-dir");<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>    // Read and modified in org.apache.hadoop.mapred.MiniMRCluster<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    createSubDir(<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      "mapreduce.cluster.local.dir",<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      testPath, "mapred-local-dir");<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>    return testPath;<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>    // 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 &amp;&amp; !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>   */<a name="line.487"></a>
-<span class="sourceLineNo">488</span>  public HTableDescriptor getMetaTableDescriptor() {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    try {<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      return new FSTableDescriptors(conf).get(TableName.META_TABLE_NAME);<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    } catch (IOException e) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      throw new RuntimeException("Unable to create META table descriptor", e);<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>  /**<a name="line.496"></a>
-<span class="sourceLineNo">497</span>   * @return Where the DFS cluster will write data on the local subsystem.<a name="line.497"></a>
-<span class="sourceLineNo">498</span>   * Creates it if it does not exist already.  A subdir of {@link #getBaseTestDir()}<a name="line.498"></a>
-<span class="sourceLineNo">499</span>   * @see #getTestFileSystem()<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>  Path getClusterTestDir() {<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    if (clusterTestDir == null){<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      setupClusterTestDir();<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    }<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    return new Path(clusterTestDir.getAbsolutePath());<a name="line.505"></a>
-<span class="sourceLineNo">506</span>  }<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>   * Creates a directory for the DFS cluster, under the test data<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   */<a name="line.510"></a>
-<span class="sourceLineNo">511</span>  private void setupClusterTestDir() {<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    if (clusterTestDir != null) {<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      return;<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>    // Using randomUUID ensures that multiple clusters can be launched by<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    //  a same test, if it stops &amp; starts them<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    Path testDir = getDataTestDir("dfscluster_" + UUID.randomUUID().toString());<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    clusterTestDir = new File(testDir.toString()).getAbsoluteFile();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    // Have it cleaned up on exit<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    boolean b = deleteOnExit();<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    if (b) clusterTestDir.deleteOnExit();<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    LOG.info("Created new mini-cluster data directory: " + clusterTestDir + ", deleteOnExit=" + b);<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>  /**<a name="line.527"></a>
-<span class="sourceLineNo">528</span>   * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.528"></a>
-<span class="sourceLineNo">529</span>   * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.529"></a>
-<span class="sourceLineNo">530</span>   * if the test relies on it.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>   * @return a unique path in the test filesystem<a name="line.531"></a>
-<span class="sourceLineNo">532</span>   */<a name="line.532"></a>
-<span class="sourceLineNo">533</span>  public Path getDataTestDirOnTestFS() throws IOException {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    if (dataTestDirOnTestFS == null) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      setupDataTestDirOnTestFS();<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>    return dataTestDirOnTestFS;<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>   * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.542"></a>
-<span class="sourceLineNo">543</span>   * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.543"></a>
-<span class="sourceLineNo">544</span>   * if the test relies on it.<a name="line.544"></a>
-<span class="sourceLineNo">545</span>   * @return a unique path in the test filesystem<a name="line.545"></a>
-<span class="sourceLineNo">546</span>   * @param subdirName name of the subdir to create under the base test dir<a name="line.546"></a>
-<span class="sourceLineNo">547</span>   */<a name="line.547"></a>
-<span class="sourceLineNo">548</span>  public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.549"></a>
-<span class="sourceLineNo">550</span>  }<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>   * Sets up a path in test filesystem to be used by tests.<a name="line.553"></a>
-<span class="sourceLineNo">554</span>   * Creates a new directory if not already setup.<a name="line.554"></a>
-<span class="sourceLineNo">555</span>   */<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  private void setupDataTestDirOnTestFS() throws IOException {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    if (dataTestDirOnTestFS != null) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      LOG.warn("Data test on test fs dir already setup in "<a name="line.558"></a>
-<span class="sourceLineNo">559</span>          + dataTestDirOnTestFS.toString());<a name="line.559"></a>
-<span class="sourceLineNo">560</span>      return;<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    }<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.562"></a>
-<span class="sourceLineNo">563</span>  }<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span>  /**<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   * Sets up a new path in test filesystem to be used by tests.<a name="line.566"></a>
-<span class="sourceLineNo">567</span>   */<a name="line.567"></a>
-<span class="sourceLineNo">568</span>  private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    //The file system can be either local, mini dfs, or if the configuration<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.570"></a>
-<span class="sourceLineNo">571</span>    //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    //the working directory, and create a unique sub dir there<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    FileSystem fs = getTestFileSystem();<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    Path newDataTestDir;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    String randomStr = UUID.randomUUID().toString();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>    if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      File dataTestDir = new File(newDataTestDir.toString());<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    } else {<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      Path base = getBaseTestDirOnTestFS();<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      newDataTestDir = new Path(base, randomStr);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    return newDataTestDir;<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 the test data directory on the test filesystem.<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @return True if we removed the test dirs<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() throws IOException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    if (ret)<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      dataTestDirOnTestFS = null;<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    return ret;<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>   * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @return True if we removed child<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   * @throws IOException<a name="line.603"></a>
-<span class="sourceLineNo">604</span>   */<a name="line.604"></a>
-<span class="sourceLineNo">605</span>  public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    return getTestFileSystem().delete(cpath, true);<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>   * @param servers How many DNs to start.<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(int servers) throws Exception {<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    return startMiniDFSCluster(servers, null);<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>  /**<a name="line.621"></a>
-<span class="sourceLineNo">622</span>   * Start a minidfscluster.<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   * This is useful if you want to run datanode on distinct hosts for things<a name="line.623"></a>
-<span class="sourceLineNo">624</span>   * like HDFS block location verification.<a name="line.624"></a>
-<span class="sourceLineNo">625</span>   * If you start MiniDFSCluster without host names, all instances of the<a name="line.625"></a>
-<span class="sourceLineNo">626</span>   * datanodes will have the same host name.<a name="line.626"></a>
+<span class="sourceLineNo">430</span>  private void createSubDirAndSystemProperty(<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    String propertyName, Path parent, String subDirName){<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span>    String sysValue = System.getProperty(propertyName);<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>    if (sysValue != null) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      // There is already a value set. So we do nothing but hope<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      //  that there will be no conflicts<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      LOG.info("System.getProperty(\""+propertyName+"\") already set to: "+<a name="line.438"></a>
+<span class="sourceLineNo">439</span>        sysValue + " so I do NOT create it in " + parent);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>      String confValue = conf.get(propertyName);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      if (confValue != null &amp;&amp; !confValue.endsWith(sysValue)){<a name="line.441"></a>
+<span class="sourceLineNo">442</span>       LOG.warn(<a name="line.442"></a>
+<span class="sourceLineNo">443</span>         propertyName + " property value differs in configuration and system: "+<a name="line.443"></a>
+<span class="sourceLineNo">444</span>         "Configuration="+confValue+" while System="+sysValue+<a name="line.444"></a>
+<span class="sourceLineNo">445</span>         " Erasing configuration value by system value."<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>      conf.set(propertyName, sysValue);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    } else {<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      // Ok, it's not set, so we create it as a subdirectory<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      createSubDir(propertyName, parent, subDirName);<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      System.setProperty(propertyName, conf.get(propertyName));<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    }<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>   * @return Where to write test data on the test filesystem; Returns working directory<a name="line.457"></a>
+<span class="sourceLineNo">458</span>   * for the test filesystem by default<a name="line.458"></a>
+<span class="sourceLineNo">459</span>   * @see #setupDataTestDirOnTestFS()<a name="line.459"></a>
+<span class="sourceLineNo">460</span>   * @see #getTestFileSystem()<a name="line.460"></a>
+<span class="sourceLineNo">461</span>   */<a name="line.461"></a>
+<span class="sourceLineNo">462</span>  private Path getBaseTestDirOnTestFS() throws IOException {<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    FileSystem fs = getTestFileSystem();<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    return new Path(fs.getWorkingDirectory(), "test-data");<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>  /**<a name="line.467"></a>
+<span class="sourceLineNo">468</span>   * @return META table descriptor<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   */<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  public HTableDescriptor getMetaTableDescriptor() {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    try {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      return new FSTableDescriptors(conf).get(TableName.META_TABLE_NAME);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    } catch (IOException e) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>      throw new RuntimeException("Unable to create META table descriptor", e);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>    }<a name="line.475"></a>
+<span class="sourceLineNo">476</span>  }<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>   * @return Where the DFS cluster will write data on the local subsystem.<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   * Creates it if it does not exist already.  A subdir of {@link #getBaseTestDir()}<a name="line.480"></a>
+<span class="sourceLineNo">481</span>   * @see #getTestFileSystem()<a name="line.481"></a>
+<span class="sourceLineNo">482</span>   */<a name="line.482"></a>
+<span class="sourceLineNo">483</span>  Path getClusterTestDir() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    if (clusterTestDir == null){<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      setupClusterTestDir();<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    }<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    return new Path(clusterTestDir.getAbsolutePath());<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>  /**<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   * Creates a directory for the DFS cluster, under the test data<a name="line.491"></a>
+<span class="sourceLineNo">492</span>   */<a name="line.492"></a>
+<span class="sourceLineNo">493</span>  private void setupClusterTestDir() {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (clusterTestDir != null) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      return;<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>    // Using randomUUID ensures that multiple clusters can be launched by<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    //  a same test, if it stops &amp; starts them<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    Path testDir = getDataTestDir("dfscluster_" + UUID.randomUUID().toString());<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    clusterTestDir = new File(testDir.toString()).getAbsoluteFile();<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    // Have it cleaned up on exit<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    boolean b = deleteOnExit();<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    if (b) clusterTestDir.deleteOnExit();<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    conf.set(TEST_DIRECTORY_KEY, clusterTestDir.getPath());<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    LOG.info("Created new mini-cluster data directory: " + clusterTestDir + ", deleteOnExit=" + b);<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 a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.511"></a>
+<span class="sourceLineNo">512</span>   * if the test relies on it.<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   * @return a unique path in the test filesystem<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   */<a name="line.514"></a>
+<span class="sourceLineNo">515</span>  public Path getDataTestDirOnTestFS() throws IOException {<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    if (dataTestDirOnTestFS == null) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      setupDataTestDirOnTestFS();<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>    return dataTestDirOnTestFS;<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>  /**<a name="line.523"></a>
+<span class="sourceLineNo">524</span>   * Returns a Path in the test filesystem, obtained from {@link #getTestFileSystem()}<a name="line.524"></a>
+<span class="sourceLineNo">525</span>   * to write temporary test data. Call this method after setting up the mini dfs cluster<a name="line.525"></a>
+<span class="sourceLineNo">526</span>   * if the test relies on it.<a name="line.526"></a>
+<span class="sourceLineNo">527</span>   * @return a unique path in the test filesystem<a name="line.527"></a>
+<span class="sourceLineNo">528</span>   * @param subdirName name of the subdir to create under the base test dir<a name="line.528"></a>
+<span class="sourceLineNo">529</span>   */<a name="line.529"></a>
+<span class="sourceLineNo">530</span>  public Path getDataTestDirOnTestFS(final String subdirName) throws IOException {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    return new Path(getDataTestDirOnTestFS(), subdirName);<a name="line.531"></a>
+<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span>  /**<a name="line.534"></a>
+<span class="sourceLineNo">535</span>   * Sets up a path in test filesystem to be used by tests.<a name="line.535"></a>
+<span class="sourceLineNo">536</span>   * Creates a new directory if not already setup.<a name="line.536"></a>
+<span class="sourceLineNo">537</span>   */<a name="line.537"></a>
+<span class="sourceLineNo">538</span>  private void setupDataTestDirOnTestFS() throws IOException {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    if (dataTestDirOnTestFS != null) {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      LOG.warn("Data test on test fs dir already setup in "<a name="line.540"></a>
+<span class="sourceLineNo">541</span>          + dataTestDirOnTestFS.toString());<a name="line.541"></a>
+<span class="sourceLineNo">542</span>      return;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    dataTestDirOnTestFS = getNewDataTestDirOnTestFS();<a name="line.544"></a>
+<span class="sourceLineNo">545</span>  }<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span>  /**<a name="line.547"></a>
+<span class="sourceLineNo">548</span>   * Sets up a new path in test filesystem to be used by tests.<a name="line.548"></a>
+<span class="sourceLineNo">549</span>   */<a name="line.549"></a>
+<span class="sourceLineNo">550</span>  private Path getNewDataTestDirOnTestFS() throws IOException {<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    //The file system can be either local, mini dfs, or if the configuration<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    //is supplied externally, it can be an external cluster FS. If it is a local<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    //file system, the tests should use getBaseTestDir, otherwise, we can use<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    //the working directory, and create a unique sub dir there<a name="line.554"></a>
+<span class="sourceLineNo">555</span>    FileSystem fs = getTestFileSystem();<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    Path newDataTestDir;<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    String randomStr = UUID.randomUUID().toString();<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    if (fs.getUri().getScheme().equals(FileSystem.getLocal(conf).getUri().getScheme())) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      newDataTestDir = new Path(getDataTestDir(), randomStr);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>      File dataTestDir = new File(newDataTestDir.toString());<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      if (deleteOnExit()) dataTestDir.deleteOnExit();<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    } else {<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      Path base = getBaseTestDirOnTestFS();<a name="line.563"></a>
+<span class="sourceLineNo">564</span>      newDataTestDir = new Path(base, randomStr);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>      if (deleteOnExit()) fs.deleteOnExit(newDataTestDir);<a name="line.565"></a>
+<span class="sourceLineNo">566</span>    }<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    return newDataTestDir;<a name="line.567"></a>
+<span class="sourceLineNo">568</span>  }<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>   * Cleans the test data directory on the test filesystem.<a name="line.571"></a>
+<span class="sourceLineNo">572</span>   * @return True if we removed the test dirs<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   * @throws IOException<a name="line.573"></a>
+<span class="sourceLineNo">574</span>   */<a name="line.574"></a>
+<span class="sourceLineNo">575</span>  public boolean cleanupDataTestDirOnTestFS() throws IOException {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    boolean ret = getTestFileSystem().delete(dataTestDirOnTestFS, true);<a name="line.576"></a>
+<span class="sourceLineNo">577</span>    if (ret)<a name="line.577"></a>
+<span class="sourceLineNo">578</span>      dataTestDirOnTestFS = null;<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    return ret;<a name="line.579"></a>
+<span class="sourceLineNo">580</span>  }<a name="line.580"></a>
+<span class="sourceLineNo">581</span><a name="line.581"></a>
+<span class="sourceLineNo">582</span>  /**<a name="line.582"></a>
+<span class="sourceLineNo">583</span>   * Cleans a subdirectory under the test data directory on the test filesystem.<a name="line.583"></a>
+<span class="sourceLineNo">584</span>   * @return True if we removed child<a name="line.584"></a>
+<span class="sourceLineNo">585</span>   * @throws IOException<a name="line.585"></a>
+<span class="sourceLineNo">586</span>   */<a name="line.586"></a>
+<span class="sourceLineNo">587</span>  public boolean cleanupDataTestDirOnTestFS(String subdirName) throws IOException {<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    Path cpath = getDataTestDirOnTestFS(subdirName);<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    return getTestFileSystem().delete(cpath, true);<a name="line.589"></a>
+<span class="sourceLineNo">590</span>  }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>  /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   * Start a minidfscluster.<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   * @param servers How many DNs to start.<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   * @throws Exception<a name="line.595"></a>
+<span class="sourceLineNo">596</span>   * @see {@link #shutdownMiniDFSCluster()}<a name="line.596"></a>
+<span class="sourceLineNo">597</span>   * @return The mini dfs cluster created.<a name="line.597"></a>
+<span class="sourceLineNo">598</span>   */<a name="line.598"></a>
+<span class="sourceLineNo">599</span>  public MiniDFSCluster startMiniDFSCluster(int servers) throws Exception {<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    return startMiniDFSCluster(servers, null);<a name="line.600"></a>
+<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
+<span class="sourceLineNo">602</span><a name="line.602"></a>
+<span class="sourceLineNo">603</span>  /**<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   * Start a minidfscluster.<a name="line.604"></a>
+<span class="sourceLineNo">605</span>   * This is useful if you want to run datanode on distinct hosts for things<a name="line.605"></a>
+<span class="sourceLineNo">606</span>   * like HDFS block location verification.<a name="line.606"></a>
+<span class="sourceLineNo">607</span>   * If you start MiniDFSCluster without host names, all instances of the<a name="line.607"></a>
+<span class="sourceLineNo">608</span>   * datanodes will have the same host name.<a name="line.608"></a>
+<span class="sourceLineNo">609</span>   * @param hosts hostnames DNs to run on.<a name="line.609"></a>
+<span class="sourceLineNo">610</span>   * @throws Exception<a name="line.610"></a>
+<span class="sourceLineNo">611</span>   * @see {@link #shutdownMiniDFSCluster()}<a name="line.611"></a>
+<span class="sourceLineNo">612</span>   * @return The mini dfs cluster created.<a name="line.612"></a>
+<span class="sourceLineNo">613</span>   */<a name="line.613"></a>
+<span class="sourceLineNo">614</span>  public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.614"></a>
+<span class="sourceLineNo">615</span>  throws Exception {<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    if ( hosts != null &amp;&amp; hosts.length != 0) {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      return startMiniDFSCluster(hosts.length, hosts);<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    } else {<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      return startMiniDFSCluster(1, null);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
+<span class="sourceLineNo">621</span>  }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span>  /**<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   * Start a minidfscluster.<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   * Can only create one.<a name="line.625"></a>
+<span class="sourceLineNo">626</span>   * @param servers How many DNs to start.<a name="line.626"></a>
 <span class="sourceLineNo">627</span>   * @param hosts hostnames DNs to run on.<a name="line.627"></a>
 <span class="sourceLineNo">628</span>   * @throws Exception<a name="line.628"></a>
 <span class="sourceLineNo">629</span>   * @see {@link #shutdownMiniDFSCluster()}<a name="line.629"></a>
 <span class="sourceLineNo">630</span>   * @return The mini dfs cluster created.<a name="line.630"></a>
 <span class="sourceLineNo">631</span>   */<a name="line.631"></a>
-<span class="sourceLineNo">632</span>  public MiniDFSCluster startMiniDFSCluster(final String hosts[])<a name="line.632"></a>
+<span class="sourceLineNo">632</span>  public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.632"></a>
 <span class="sourceLineNo">633</span>  throws Exception {<a name="line.633"></a>
-<span class="sourceLineNo">634</span>    if ( hosts != null &amp;&amp; hosts.length != 0) {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      return startMiniDFSCluster(hosts.length, hosts);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    } else {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      return startMiniDFSCluster(1, null);<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><a name="line.640"></a>
-<span class="sourceLineNo">641</span>  /**<a name="line.641"></a>
-<span class="sourceLineNo">642</span>   * Start a minidfscluster.<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Can only create one.<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   * @param servers How many DNs to start.<a name="line.644"></a>
-<span class="sourceLineNo">645</span>   * @param hosts hostnames DNs to run on.<a name="line.645"></a>
-<span class="sourceLineNo">646</span>   * @throws Exception<a name="line.646"></a>
-<span class="sourceLineNo">647</span>   * @see {@link #shutdownMiniDFSCluster()}<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   * @return The mini dfs cluster created.<a name="line.648"></a>
-<span class="sourceLineNo">649</span>   */<a name="line.649"></a>
-<span class="sourceLineNo">650</span>  public MiniDFSCluster startMiniDFSCluster(int servers, final String hosts[])<a name="line.650"></a>
-<span class="sourceLineNo">651</span>  throws Exception {<a name="line.651"></a>
-<span class="sourceLineNo">652</span>    createDirsAndSetProperties();<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.653"></a>
-<span class="sourceLineNo">654</span><a name="line.654"></a>
-<span class="sourceLineNo">655</span>    // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        setLevel(org.apache.log4j.Level.ERROR);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.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><a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span>    this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      true, null, null, hosts, null);<a name="line.663"></a>
-<span class="sourceLineNo">664</span><a name="line.664"></a>
-<span class="sourceLineNo">665</span>    // Set this just-started cluster as our filesystem.<a name="line.665"></a>
-<span class="sourceLineNo">666</span>    setFs();<a name="line.666"></a>
+<span class="sourceLineNo">634</span>    createDirsAndSetProperties();<a name="line.634"></a>
+<span class="sourceLineNo">635</span>    EditLogFileOutputStream.setShouldSkipFsyncForTesting(true);<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span>    // Error level to skip some warnings specific to the minicluster. See HBASE-4709<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.util.MBeans.class).<a name="line.638"></a>
+<span class="sourceLineNo">639</span>        setLevel(org.apache.log4j.Level.ERROR);<a name="line.639"></a>
+<span class="sourceLineNo">640</span>    org.apache.log4j.Logger.getLogger(org.apache.hadoop.metrics2.impl.MetricsSystemImpl.class).<a name="line.640"></a>
+<span class="sourceLineNo">641</span>        setLevel(org.apache.log4j.Level.ERROR);<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>    this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.644"></a>
+<span class="sourceLineNo">645</span>      true, null, null, hosts, null);<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span>    // Set this just-started cluster as our filesystem.<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    setFs();<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span>    // Wait for the cluster to be totally up<a name="line.650"></a>
+<span class="sourceLineNo">651</span>    this.dfsCluster.waitClusterUp();<a name="line.651"></a>
+<span class="sourceLineNo">652</span><a name="line.652"></a>
+<span class="sourceLineNo">653</span>    //reset the test directory for test file system<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    dataTestDirOnTestFS = null;<a name="line.654"></a>
+<span class="sourceLineNo">655</span><a name="line.655"></a>
+<span class="sourceLineNo">656</span>    return this.dfsCluster;<a name="line.656"></a>
+<span class="sourceLineNo">657</span>  }<a name="line.657"></a>
+<span class="sourceLineNo">658</span><a name="line.658"></a>
+<span class="sourceLineNo">659</span>  private void setFs() throws IOException {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    if(this.dfsCluster == null){<a name="line.660"></a>
+<span class="sourceLineNo">661</span>      LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.661"></a>
+<span class="sourceLineNo">662</span>      return;<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    }<a name="line.663"></a>
+<span class="sourceLineNo">664</span>    FileSystem fs = this.dfsCluster.getFileSystem();<a name="line.664"></a>
+<span class="sourceLineNo">665</span>    FSUtils.setFsDefault(this.conf, new Path(fs.getUri()));<a name="line.665"></a>
+<span class="sourceLineNo">666</span>  }<a name="line.666"></a>
 <span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span>    // Wait for the cluster to be totally up<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    this.dfsCluster.waitClusterUp();<a name="line.669"></a>
-<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span>    //reset the test directory for test file system<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    dataTestDirOnTestFS = null;<a name="line.672"></a>
+<span class="sourceLineNo">668</span>  public MiniDFSCluster startMiniDFSCluster(int servers, final  String racks[], String hosts[])<a name="line.668"></a>
+<span class="sourceLineNo">669</span>      throws Exception {<a name="line.669"></a>
+<span class="sourceLineNo">670</span>    createDirsAndSetProperties();<a name="line.670"></a>
+<span class="sourceLineNo">671</span>    this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,<a name="line.671"></a>
+<span class="sourceLineNo">672</span>        true, null, racks, hosts, null);<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>  private void setFs() throws IOException {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>    if(this.dfsCluster == null){<a name="line.678"></a>
-<span class="sourceLineNo">679</span>      LOG.info("Skipping setting fs because dfsCluster is null");<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      return;<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    FileSystem f

<TRUNCATED>

Mime
View raw message