hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [03/37] hbase-site git commit: Published site at .
Date Tue, 17 Oct 2017 15:15:37 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
index f4edf1f..93f7270 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
@@ -233,109 +233,111 @@
 <span class="sourceLineNo">225</span>        "testZooKeeperAbort-faulty", null)) {<a name="line.225"></a>
 <span class="sourceLineNo">226</span>      faultyZK.init();<a name="line.226"></a>
 <span class="sourceLineNo">227</span>      cleaner.setConf(conf, faultyZK);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      assertFalse(cleaner.isStopped());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // when zk is working both files should be returned<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    cleaner = new ReplicationLogCleaner();<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    try (ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null)) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      cleaner.setConf(conf, zkw);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      assertTrue(iter.hasNext());<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      assertEquals(new Path("log1"), iter.next().getPath());<a name="line.241"></a>
+<span class="sourceLineNo">228</span>      cleaner.preClean();<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      assertFalse(cleaner.isStopped());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // when zk is working both files should be returned<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    cleaner = new ReplicationLogCleaner();<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try (ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null)) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      cleaner.setConf(conf, zkw);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      cleaner.preClean();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.241"></a>
 <span class="sourceLineNo">242</span>      assertTrue(iter.hasNext());<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      assertEquals(new Path("log2"), iter.next().getPath());<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      assertFalse(iter.hasNext());<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  static class DummyServer implements Server {<a name="line.248"></a>
+<span class="sourceLineNo">243</span>      assertEquals(new Path("log1"), iter.next().getPath());<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      assertTrue(iter.hasNext());<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      assertEquals(new Path("log2"), iter.next().getPath());<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      assertFalse(iter.hasNext());<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
 <span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    public Configuration getConfiguration() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return TEST_UTIL.getConfiguration();<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>    @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      try {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      } catch (IOException e) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        e.printStackTrace();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return null;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    @Override<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      return null;<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    public ClusterConnection getConnection() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      return null;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      return null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    public ServerName getServerName() {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    @Override<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    public void abort(String why, Throwable e) {}<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    @Override<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    public boolean isAborted() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      return false;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void stop(String why) {}<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    public boolean isStopped() {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      return false;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    public ChoreService getChoreService() {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return null;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    public ClusterConnection getClusterConnection() {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      return null;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    private RecoverableZooKeeper zk;<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        throws ZooKeeperConnectionException, IOException {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      super(conf, identifier, abortable);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>    public void init() throws Exception {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.322"></a>
-<span class="sourceLineNo">323</span>          .when(zk).getData("/hbase/replication/rs", null, new Stat());<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      return zk;<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>}<a name="line.330"></a>
+<span class="sourceLineNo">250</span>  static class DummyServer implements Server {<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    @Override<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    public Configuration getConfiguration() {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      return TEST_UTIL.getConfiguration();<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>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      try {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      } catch (IOException e) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        e.printStackTrace();<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      return null;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>    @Override<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      return null;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>    @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    public ClusterConnection getConnection() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      return null;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>    @Override<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    @Override<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    public ServerName getServerName() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>    @Override<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    public void abort(String why, Throwable e) {}<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    public boolean isAborted() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      return false;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void stop(String why) {}<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    @Override<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    public boolean isStopped() {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      return false;<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>    @Override<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    public ChoreService getChoreService() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      return null;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>    @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    public ClusterConnection getClusterConnection() {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      return null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    private RecoverableZooKeeper zk;<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        throws ZooKeeperConnectionException, IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      super(conf, identifier, abortable);<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>    public void init() throws Exception {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          .when(zk).getData("/hbase/replication/rs", null, new Stat());<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      return zk;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>}<a name="line.332"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
index f4edf1f..93f7270 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
@@ -233,109 +233,111 @@
 <span class="sourceLineNo">225</span>        "testZooKeeperAbort-faulty", null)) {<a name="line.225"></a>
 <span class="sourceLineNo">226</span>      faultyZK.init();<a name="line.226"></a>
 <span class="sourceLineNo">227</span>      cleaner.setConf(conf, faultyZK);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      assertFalse(cleaner.isStopped());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // when zk is working both files should be returned<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    cleaner = new ReplicationLogCleaner();<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    try (ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null)) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      cleaner.setConf(conf, zkw);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      assertTrue(iter.hasNext());<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      assertEquals(new Path("log1"), iter.next().getPath());<a name="line.241"></a>
+<span class="sourceLineNo">228</span>      cleaner.preClean();<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      assertFalse(cleaner.isStopped());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // when zk is working both files should be returned<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    cleaner = new ReplicationLogCleaner();<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try (ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null)) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      cleaner.setConf(conf, zkw);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      cleaner.preClean();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.241"></a>
 <span class="sourceLineNo">242</span>      assertTrue(iter.hasNext());<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      assertEquals(new Path("log2"), iter.next().getPath());<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      assertFalse(iter.hasNext());<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  static class DummyServer implements Server {<a name="line.248"></a>
+<span class="sourceLineNo">243</span>      assertEquals(new Path("log1"), iter.next().getPath());<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      assertTrue(iter.hasNext());<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      assertEquals(new Path("log2"), iter.next().getPath());<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      assertFalse(iter.hasNext());<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
 <span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    public Configuration getConfiguration() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return TEST_UTIL.getConfiguration();<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>    @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      try {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      } catch (IOException e) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        e.printStackTrace();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return null;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    @Override<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      return null;<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    public ClusterConnection getConnection() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      return null;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      return null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    public ServerName getServerName() {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    @Override<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    public void abort(String why, Throwable e) {}<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    @Override<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    public boolean isAborted() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      return false;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void stop(String why) {}<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    public boolean isStopped() {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      return false;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    public ChoreService getChoreService() {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return null;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    public ClusterConnection getClusterConnection() {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      return null;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    private RecoverableZooKeeper zk;<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        throws ZooKeeperConnectionException, IOException {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      super(conf, identifier, abortable);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>    public void init() throws Exception {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.322"></a>
-<span class="sourceLineNo">323</span>          .when(zk).getData("/hbase/replication/rs", null, new Stat());<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      return zk;<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>}<a name="line.330"></a>
+<span class="sourceLineNo">250</span>  static class DummyServer implements Server {<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    @Override<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    public Configuration getConfiguration() {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      return TEST_UTIL.getConfiguration();<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>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      try {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      } catch (IOException e) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        e.printStackTrace();<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      return null;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>    @Override<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      return null;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>    @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    public ClusterConnection getConnection() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      return null;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>    @Override<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    @Override<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    public ServerName getServerName() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>    @Override<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    public void abort(String why, Throwable e) {}<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    public boolean isAborted() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      return false;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void stop(String why) {}<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    @Override<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    public boolean isStopped() {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      return false;<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>    @Override<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    public ChoreService getChoreService() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      return null;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>    @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    public ClusterConnection getClusterConnection() {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      return null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    private RecoverableZooKeeper zk;<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        throws ZooKeeperConnectionException, IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      super(conf, identifier, abortable);<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>    public void init() throws Exception {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          .when(zk).getData("/hbase/replication/rs", null, new Stat());<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      return zk;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>}<a name="line.332"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
index f4edf1f..93f7270 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
@@ -233,109 +233,111 @@
 <span class="sourceLineNo">225</span>        "testZooKeeperAbort-faulty", null)) {<a name="line.225"></a>
 <span class="sourceLineNo">226</span>      faultyZK.init();<a name="line.226"></a>
 <span class="sourceLineNo">227</span>      cleaner.setConf(conf, faultyZK);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      assertFalse(cleaner.isStopped());<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    // when zk is working both files should be returned<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    cleaner = new ReplicationLogCleaner();<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    try (ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null)) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      cleaner.setConf(conf, zkw);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      assertTrue(iter.hasNext());<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      assertEquals(new Path("log1"), iter.next().getPath());<a name="line.241"></a>
+<span class="sourceLineNo">228</span>      cleaner.preClean();<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      assertFalse(cleaner.isStopped());<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // when zk is working both files should be returned<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    cleaner = new ReplicationLogCleaner();<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    try (ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null)) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      cleaner.setConf(conf, zkw);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      cleaner.preClean();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.241"></a>
 <span class="sourceLineNo">242</span>      assertTrue(iter.hasNext());<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      assertEquals(new Path("log2"), iter.next().getPath());<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      assertFalse(iter.hasNext());<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  static class DummyServer implements Server {<a name="line.248"></a>
+<span class="sourceLineNo">243</span>      assertEquals(new Path("log1"), iter.next().getPath());<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      assertTrue(iter.hasNext());<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      assertEquals(new Path("log2"), iter.next().getPath());<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      assertFalse(iter.hasNext());<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
 <span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    public Configuration getConfiguration() {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return TEST_UTIL.getConfiguration();<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>    @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      try {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      } catch (IOException e) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        e.printStackTrace();<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return null;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    @Override<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      return null;<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    public ClusterConnection getConnection() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      return null;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>    @Override<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      return null;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    @Override<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    public ServerName getServerName() {<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    @Override<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    public void abort(String why, Throwable e) {}<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    @Override<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    public boolean isAborted() {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      return false;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void stop(String why) {}<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    @Override<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    public boolean isStopped() {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      return false;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>    @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    public ChoreService getChoreService() {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      return null;<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    public ClusterConnection getClusterConnection() {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      return null;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    private RecoverableZooKeeper zk;<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        throws ZooKeeperConnectionException, IOException {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      super(conf, identifier, abortable);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>    public void init() throws Exception {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.322"></a>
-<span class="sourceLineNo">323</span>          .when(zk).getData("/hbase/replication/rs", null, new Stat());<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      return zk;<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>}<a name="line.330"></a>
+<span class="sourceLineNo">250</span>  static class DummyServer implements Server {<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    @Override<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    public Configuration getConfiguration() {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      return TEST_UTIL.getConfiguration();<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>    @Override<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      try {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      } catch (IOException e) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        e.printStackTrace();<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      return null;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>    @Override<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      return null;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>    @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    public ClusterConnection getConnection() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      return null;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>    @Override<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      return null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>    @Override<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    public ServerName getServerName() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>    @Override<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    public void abort(String why, Throwable e) {}<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    @Override<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    public boolean isAborted() {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      return false;<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    }<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    @Override<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    public void stop(String why) {}<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    @Override<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    public boolean isStopped() {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      return false;<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>    @Override<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    public ChoreService getChoreService() {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      return null;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>    @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    public ClusterConnection getClusterConnection() {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      return null;<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    private RecoverableZooKeeper zk;<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        throws ZooKeeperConnectionException, IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      super(conf, identifier, abortable);<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>    public void init() throws Exception {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          .when(zk).getData("/hbase/replication/rs", null, new Stat());<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      return zk;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>  }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>}<a name="line.332"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.html
new file mode 100644
index 0000000..4ab62af
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.html
@@ -0,0 +1,258 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.regionserver;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import static org.junit.Assert.assertTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.ArrayList;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.Collection;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.HashMap;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Map;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HConstants;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.ServerName;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.TableName;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Table;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.RegionSplitter;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.AfterClass;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.BeforeClass;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>@Category({ RegionServerTests.class, MediumTests.class })<a name="line.47"></a>
+<span class="sourceLineNo">048</span>public class TestRegionReplicasAreDistributed {<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  private static final Log LOG = LogFactory.getLog(TestRegionReplicasAreDistributed.class);<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>  private static final int NB_SERVERS = 3;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  private static Table table;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  private static final HBaseTestingUtility HTU = new HBaseTestingUtility();<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private static final byte[] f = HConstants.CATALOG_FAMILY;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  Map&lt;ServerName, Collection&lt;RegionInfo&gt;&gt; serverVsOnlineRegions;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  Map&lt;ServerName, Collection&lt;RegionInfo&gt;&gt; serverVsOnlineRegions2;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  Map&lt;ServerName, Collection&lt;RegionInfo&gt;&gt; serverVsOnlineRegions3;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  Map&lt;ServerName, Collection&lt;RegionInfo&gt;&gt; serverVsOnlineRegions4;<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>  @BeforeClass<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  public static void before() throws Exception {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    HTU.getConfiguration().setInt("&gt;hbase.master.wait.on.regionservers.mintostart", 3);<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>    HTU.startMiniCluster(NB_SERVERS);<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    Thread.sleep(3000);<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    final TableName tableName =<a name="line.68"></a>
+<span class="sourceLineNo">069</span>        TableName.valueOf(TestRegionReplicasAreDistributed.class.getSimpleName());<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // Create table then get the single region for our new table.<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    createTableDirectlyFromHTD(tableName);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private static void createTableDirectlyFromHTD(final TableName tableName) throws IOException {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    htd.setRegionReplication(3);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    // create a table with 3 replication<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>    table = HTU.createTable(htd, new byte[][] { f }, getSplits(20),<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      new Configuration(HTU.getConfiguration()));<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  private static byte[][] getSplits(int numRegions) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    RegionSplitter.UniformSplit split = new RegionSplitter.UniformSplit();<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    split.setFirstRow(Bytes.toBytes(0L));<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    split.setLastRow(Bytes.toBytes(Long.MAX_VALUE));<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    return split.split(numRegions);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  @AfterClass<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  public static void afterClass() throws Exception {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    HRegionServer.TEST_SKIP_REPORTING_TRANSITION = false;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    table.close();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    HTU.shutdownMiniCluster();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span>  private HRegionServer getRS() {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    return HTU.getMiniHBaseCluster().getRegionServer(0);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  private HRegionServer getSecondaryRS() {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    return HTU.getMiniHBaseCluster().getRegionServer(1);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  private HRegionServer getTertiaryRS() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    return HTU.getMiniHBaseCluster().getRegionServer(2);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>  @Test(timeout = 60000)<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  public void testRegionReplicasCreatedAreDistributed() throws Exception {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    try {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      checkAndAssertRegionDistribution(false);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      // now diesbale and enable the table again. It should be truly distributed<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      HTU.getAdmin().disableTable(table.getName());<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      LOG.info("Disabled the table " + table.getName());<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      LOG.info("enabling the table " + table.getName());<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      HTU.getAdmin().enableTable(table.getName());<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      LOG.info("Enabled the table " + table.getName());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      boolean res = checkAndAssertRegionDistribution(true);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      assertTrue("Region retainment not done ", res);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    } finally {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      HTU.getAdmin().disableTable(table.getName());<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      HTU.getAdmin().deleteTable(table.getName());<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  private boolean checkAndAssertRegionDistribution(boolean checkfourth) throws Exception {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    Collection&lt;RegionInfo&gt; onlineRegions =<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        new ArrayList&lt;RegionInfo&gt;(getRS().getOnlineRegionsLocalContext().size());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    for (HRegion region : getRS().getOnlineRegionsLocalContext()) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      onlineRegions.add(region.getRegionInfo());<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    if (this.serverVsOnlineRegions == null) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      this.serverVsOnlineRegions = new HashMap&lt;ServerName, Collection&lt;RegionInfo&gt;&gt;();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      this.serverVsOnlineRegions.put(getRS().getServerName(), onlineRegions);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    } else {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      Collection&lt;RegionInfo&gt; existingRegions =<a name="line.138"></a>
+<span class="sourceLineNo">139</span>          new ArrayList&lt;RegionInfo&gt;(this.serverVsOnlineRegions.get(getRS().getServerName()));<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      LOG.info("Count is " + existingRegions.size() + " " + onlineRegions.size());<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      for (RegionInfo existingRegion : existingRegions) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>        if (!onlineRegions.contains(existingRegion)) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>          return false;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        }<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Collection&lt;RegionInfo&gt; onlineRegions2 =<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        new ArrayList&lt;RegionInfo&gt;(getSecondaryRS().getOnlineRegionsLocalContext().size());<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    for (HRegion region : getSecondaryRS().getOnlineRegionsLocalContext()) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      onlineRegions2.add(region.getRegionInfo());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    if (this.serverVsOnlineRegions2 == null) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      this.serverVsOnlineRegions2 = new HashMap&lt;ServerName, Collection&lt;RegionInfo&gt;&gt;();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      this.serverVsOnlineRegions2.put(getSecondaryRS().getServerName(), onlineRegions2);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    } else {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      Collection&lt;RegionInfo&gt; existingRegions = new ArrayList&lt;RegionInfo&gt;(<a name="line.156"></a>
+<span class="sourceLineNo">157</span>          this.serverVsOnlineRegions2.get(getSecondaryRS().getServerName()));<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      LOG.info("Count is " + existingRegions.size() + " " + onlineRegions2.size());<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      for (RegionInfo existingRegion : existingRegions) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        if (!onlineRegions2.contains(existingRegion)) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>          return false;<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    Collection&lt;RegionInfo&gt; onlineRegions3 =<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        new ArrayList&lt;RegionInfo&gt;(getTertiaryRS().getOnlineRegionsLocalContext().size());<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    for (HRegion region : getTertiaryRS().getOnlineRegionsLocalContext()) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      onlineRegions3.add(region.getRegionInfo());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    if (this.serverVsOnlineRegions3 == null) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      this.serverVsOnlineRegions3 = new HashMap&lt;ServerName, Collection&lt;RegionInfo&gt;&gt;();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      this.serverVsOnlineRegions3.put(getTertiaryRS().getServerName(), onlineRegions3);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    } else {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      Collection&lt;RegionInfo&gt; existingRegions = new ArrayList&lt;RegionInfo&gt;(<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          this.serverVsOnlineRegions3.get(getTertiaryRS().getServerName()));<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      LOG.info("Count is " + existingRegions.size() + " " + onlineRegions3.size());<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      for (RegionInfo existingRegion : existingRegions) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        if (!onlineRegions3.contains(existingRegion)) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          return false;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // META and namespace to be added<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    return true;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>}<a name="line.186"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>


Mime
View raw message