[01/26] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.

[git-site-role]

Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 6f716f49e -> fdcfc8d5b


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fdcfc8d5/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index d211be0..bee857f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -622,10 +622,10 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a 
href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html"
 title="enum in org.apache.hadoop.hbase.regionserver"><span 
class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fdcfc8d5/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 7c105d8..5537618 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -248,10 +248,10 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
+<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a 
href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html"
 title="enum in org.apache.hadoop.hbase.test"><span 
class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fdcfc8d5/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html 
b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index 2573409..8e1c1ad 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -140,9 +140,9 @@
 <ul>
 <li type="circle">java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang"><span 
class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a 
href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" 
title="enum in org.apache.hadoop.hbase.wal"><span 
class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a 
href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" 
title="enum in org.apache.hadoop.hbase.wal"><span 
class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a 
href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html"
 title="enum in org.apache.hadoop.hbase.wal"><span 
class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a 
href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" 
title="enum in org.apache.hadoop.hbase.wal"><span 
class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fdcfc8d5/testdevapidocs/src-html/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.html
index 0396e34..073a025 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.html
@@ -181,279 +181,293 @@
 <span class="sourceLineNo">173</span>        return expectedFinalSize == 
snapshot.getUsage();<a name="line.173"></a>
 <span class="sourceLineNo">174</span>      }<a name="line.174"></a>
 <span class="sourceLineNo">175</span>    });<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>  @Test<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  public void 
testNamespacesInheritSnapshotSize() throws Exception {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    String ns = 
helper.createNamespace().getName();<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    TableName tn = 
helper.createTableWithRegions(ns, 1);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    LOG.info("Writing data");<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    // Set a quota<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    QuotaSettings settings = 
QuotaSettingsFactory.limitNamespaceSpace(<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        ns, 
SpaceQuotaHelperForTests.ONE_GIGABYTE, SpaceViolationPolicy.NO_INSERTS);<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>    admin.setQuota(settings);<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>    // Write some data and flush it to 
disk<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    final long initialSize = 2L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    helper.writeData(tn, initialSize);<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    admin.flush(tn);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>    LOG.info("Waiting until namespace 
size reflects written data");<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    // Wait until that data is seen by 
the master<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    TEST_UTIL.waitFor(30 * 1000, 500, new 
SpaceQuotaSnapshotPredicate(conn, ns) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        return snapshot.getUsage() &gt;= 
initialSize;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    });<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    // Make sure we see the "final" new 
size for the table, not some intermediate<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    waitForStableQuotaSize(conn, null, 
ns);<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>    // The actual size on disk after we 
wrote our data the first time<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    final long actualInitialSize = 
QuotaTableUtil.getCurrentSnapshot(conn, ns).getUsage();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    LOG.info("Initial table size was " + 
actualInitialSize);<a name="line.206"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>    Map&lt;String,Long&gt; snapshotSizes 
= QuotaTableUtil.getObservedSnapshotSizes(conn);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    Long size = 
snapshotSizes.get(snapshot1);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    assertNotNull("Did not observe the 
size of the snapshot", size);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    assertEquals(<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        "The recorded size of the HBase 
snapshot was not the size we expected", actualInitialSize,<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>        size.longValue());<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  @Test<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  public void 
testNamespacesInheritSnapshotSize() throws Exception {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    String ns = 
helper.createNamespace().getName();<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    TableName tn = 
helper.createTableWithRegions(ns, 1);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    LOG.info("Writing data");<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>    // Set a quota<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    QuotaSettings settings = 
QuotaSettingsFactory.limitNamespaceSpace(<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        ns, 
SpaceQuotaHelperForTests.ONE_GIGABYTE, SpaceViolationPolicy.NO_INSERTS);<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>    admin.setQuota(settings);<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>    // Write some data and flush it to 
disk<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    final long initialSize = 2L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    helper.writeData(tn, initialSize);<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    admin.flush(tn);<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>    LOG.info("Waiting until namespace 
size reflects written data");<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    // Wait until that data is seen by 
the master<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    TEST_UTIL.waitFor(30 * 1000, 500, new 
SpaceQuotaSnapshotPredicate(conn, ns) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        return snapshot.getUsage() &gt;= 
initialSize;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    });<a name="line.206"></a>
 <span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>    LOG.info("Snapshot the table");<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    final String snapshot1 = 
tn.getQualifierAsString() + "_snapshot1";<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    admin.snapshot(snapshot1, tn);<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>    // Write the same data again, then 
flush+compact. This should make sure that<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    // the snapshot is referencing files 
that the table no longer references.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    LOG.info("Write more data");<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>    helper.writeData(tn, initialSize);<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>    LOG.info("Flush the table");<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>    admin.flush(tn);<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>    LOG.info("Synchronously compacting 
the table");<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    TEST_UTIL.compact(tn, true);<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>    final long upperBound = initialSize + 
FUDGE_FOR_TABLE_SIZE;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    final long lowerBound = initialSize - 
FUDGE_FOR_TABLE_SIZE;<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>    LOG.info("Waiting for the region 
reports to reflect the correct size, between ("<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        + lowerBound + ", " + upperBound 
+ ")");<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    TEST_UTIL.waitFor(30 * 1000, 500, new 
Predicate&lt;Exception&gt;() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      @Override<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      public boolean evaluate() throws 
Exception {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        Map&lt;TableName,Long&gt; sizes = 
QuotaTableUtil.getMasterReportedTableSizes(conn);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        LOG.debug("Master observed table 
sizes from region size reports: " + sizes);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        Long size = sizes.get(tn);<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>        if (null == size) {<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>          return false;<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>        return size &lt; upperBound 
&amp;&amp; size &gt; lowerBound;<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    });<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>    // Make sure we see the "final" new 
size for the table, not some intermediate<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    waitForStableRegionSizeReport(conn, 
tn);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    final long finalSize = 
getRegionSizeReportForTable(conn, tn);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    assertNotNull("Did not expect to see 
a null size", finalSize);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    LOG.info("Final observed size of 
table: " + finalSize);<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>    // Make sure the QuotaObserverChore 
has time to reflect the new region size reports<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // (we saw above). The usage of the 
table should *not* decrease when we check it below,<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // though, because the snapshot on 
our table will cause the table to "retain" the size.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    TEST_UTIL.waitFor(20 * 1000, 500, new 
SpaceQuotaSnapshotPredicate(conn, ns) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      @Override<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      public boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        return snapshot.getUsage() &gt;= 
finalSize;<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      }<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    });<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>    // The final usage should be the sum 
of the initial size (referenced by the snapshot) and the<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    // new size we just wrote above.<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>    long expectedFinalSize = 
actualInitialSize + finalSize;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    LOG.info(<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        "Expecting namespace usage to be 
" + actualInitialSize + " + " + finalSize<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        + " = " + expectedFinalSize);<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    // The size of the table (WRT quotas) 
should now be approximately double what it was previously<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    TEST_UTIL.waitFor(30 * 1000, 1000, 
new SpaceQuotaSnapshotPredicate(conn, ns) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        LOG.debug("Checking for " + 
expectedFinalSize + " == " + snapshot.getUsage());<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        return expectedFinalSize == 
snapshot.getUsage();<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    });<a name="line.267"></a>
-<span class="sourceLineNo">268</span>  }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>  @Test<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  public void testTablesWithSnapshots() 
throws Exception {<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    final Connection conn = 
TEST_UTIL.getConnection();<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    final SpaceViolationPolicy policy = 
SpaceViolationPolicy.NO_INSERTS;<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    final TableName tn = 
helper.createTableWithRegions(10);<a name="line.274"></a>
+<span class="sourceLineNo">208</span>    // Make sure we see the "final" new 
size for the table, not some intermediate<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    waitForStableQuotaSize(conn, null, 
ns);<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>    // The actual size on disk after we 
wrote our data the first time<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    final long actualInitialSize = 
QuotaTableUtil.getCurrentSnapshot(conn, ns).getUsage();<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    LOG.info("Initial table size was " + 
actualInitialSize);<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>    LOG.info("Snapshot the table");<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>    final String snapshot1 = 
tn.getQualifierAsString() + "_snapshot1";<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    admin.snapshot(snapshot1, tn);<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    // Write the same data again, then 
flush+compact. This should make sure that<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    // the snapshot is referencing files 
that the table no longer references.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    LOG.info("Write more data");<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>    helper.writeData(tn, initialSize);<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    LOG.info("Flush the table");<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>    admin.flush(tn);<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>    LOG.info("Synchronously compacting 
the table");<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    TEST_UTIL.compact(tn, true);<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>    final long upperBound = initialSize + 
FUDGE_FOR_TABLE_SIZE;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    final long lowerBound = initialSize - 
FUDGE_FOR_TABLE_SIZE;<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>    LOG.info("Waiting for the region 
reports to reflect the correct size, between ("<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        + lowerBound + ", " + upperBound 
+ ")");<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    TEST_UTIL.waitFor(30 * 1000, 500, new 
Predicate&lt;Exception&gt;() {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      @Override<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      public boolean evaluate() throws 
Exception {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        Map&lt;TableName,Long&gt; sizes = 
QuotaTableUtil.getMasterReportedTableSizes(conn);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>        LOG.debug("Master observed table 
sizes from region size reports: " + sizes);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        Long size = sizes.get(tn);<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>        if (null == size) {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>          return false;<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>        }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        return size &lt; upperBound 
&amp;&amp; size &gt; lowerBound;<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    });<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span>    // Make sure we see the "final" new 
size for the table, not some intermediate<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    waitForStableRegionSizeReport(conn, 
tn);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    final long finalSize = 
getRegionSizeReportForTable(conn, tn);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    assertNotNull("Did not expect to see 
a null size", finalSize);<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    LOG.info("Final observed size of 
table: " + finalSize);<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    // Make sure the QuotaObserverChore 
has time to reflect the new region size reports<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    // (we saw above). The usage of the 
table should *not* decrease when we check it below,<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    // though, because the snapshot on 
our table will cause the table to "retain" the size.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    TEST_UTIL.waitFor(20 * 1000, 500, new 
SpaceQuotaSnapshotPredicate(conn, ns) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      @Override<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      public boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        return snapshot.getUsage() &gt;= 
finalSize;<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    });<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    // The final usage should be the sum 
of the initial size (referenced by the snapshot) and the<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    // new size we just wrote above.<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    long expectedFinalSize = 
actualInitialSize + finalSize;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    LOG.info(<a name="line.265"></a>
+<span class="sourceLineNo">266</span>        "Expecting namespace usage to be 
" + actualInitialSize + " + " + finalSize<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        + " = " + expectedFinalSize);<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    // The size of the table (WRT quotas) 
should now be approximately double what it was previously<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    TEST_UTIL.waitFor(30 * 1000, 1000, 
new SpaceQuotaSnapshotPredicate(conn, ns) {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>        LOG.debug("Checking for " + 
expectedFinalSize + " == " + snapshot.getUsage());<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        return expectedFinalSize == 
snapshot.getUsage();<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    });<a name="line.274"></a>
 <span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span>    // 3MB limit on the table<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>    final long tableLimit = 3L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE;<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    
TEST_UTIL.getAdmin().setQuota(QuotaSettingsFactory.limitTableSpace(tn, 
tableLimit, policy));<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    LOG.info("Writing first data set");<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>    // Write more data than should be 
allowed and flush it to disk<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    helper.writeData(tn, 1L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE, "q1");<a name="line.282"></a>
+<span class="sourceLineNo">276</span>    Map&lt;String,Long&gt; snapshotSizes 
= QuotaTableUtil.getObservedSnapshotSizes(conn);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    Long size = 
snapshotSizes.get(snapshot1);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    assertNotNull("Did not observe the 
size of the snapshot", size);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    assertEquals(<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        "The recorded size of the HBase 
snapshot was not the size we expected", actualInitialSize,<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>        size.longValue());<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
 <span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>    LOG.info("Creating snapshot");<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>    
TEST_UTIL.getAdmin().snapshot(tn.toString() + "snap1", tn, 
SnapshotType.FLUSH);<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    LOG.info("Writing second data 
set");<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    // Write some more data<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>    helper.writeData(tn, 1L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE, "q2");<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    LOG.info("Flushing and major 
compacting table");<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    // Compact the table to force the 
snapshot to own all of its files<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    TEST_UTIL.getAdmin().flush(tn);<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>    TEST_UTIL.compact(tn, true);<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span>    LOG.info("Checking for quota 
violation");<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    // Wait to observe the quota moving 
into violation<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    TEST_UTIL.waitFor(60_000, 1_000, new 
Predicate&lt;Exception&gt;() {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      @Override<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      public boolean evaluate() throws 
Exception {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        Scan s = 
QuotaTableUtil.makeQuotaSnapshotScanForTable(tn);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        try (Table t = 
conn.getTable(QuotaTableUtil.QUOTA_TABLE_NAME)) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          ResultScanner rs = 
t.getScanner(s);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>          try {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            Result r = 
Iterables.getOnlyElement(rs);<a name="line.305"></a>
-<span class="sourceLineNo">306</span>            CellScanner cs = 
r.cellScanner();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>            assertTrue(cs.advance());<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>            Cell c = cs.current();<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>            SpaceQuotaSnapshot snapshot = 
SpaceQuotaSnapshot.toSpaceQuotaSnapshot(<a name="line.309"></a>
-<span class="sourceLineNo">310</span>                
QuotaProtos.SpaceQuotaSnapshot.parseFrom(<a name="line.310"></a>
-<span class="sourceLineNo">311</span>                  
UnsafeByteOperations.unsafeWrap(<a name="line.311"></a>
-<span class="sourceLineNo">312</span>                      c.getValueArray(), 
c.getValueOffset(), c.getValueLength())));<a name="line.312"></a>
-<span class="sourceLineNo">313</span>            LOG.info(<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>                snapshot.getUsage() + "/" 
+ snapshot.getLimit() + " " + snapshot.getQuotaStatus());<a name="line.314"></a>
-<span class="sourceLineNo">315</span>            // We expect to see the table 
move to violation<a name="line.315"></a>
-<span class="sourceLineNo">316</span>            return 
snapshot.getQuotaStatus().isInViolation();<a name="line.316"></a>
-<span class="sourceLineNo">317</span>          } finally {<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>            if (null != rs) {<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>              rs.close();<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 name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  @Test<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  public void 
testRematerializedTablesDoNoInheritSpace() throws Exception {<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>    TableName tn = 
helper.createTableWithRegions(1);<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    TableName tn2 = 
helper.getNextTableName();<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    LOG.info("Writing data");<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>    // Set a quota on both tables<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>    QuotaSettings settings = 
QuotaSettingsFactory.limitTableSpace(<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        tn, 
SpaceQuotaHelperForTests.ONE_GIGABYTE, SpaceViolationPolicy.NO_INSERTS);<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>    admin.setQuota(settings);<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    QuotaSettings settings2 = 
QuotaSettingsFactory.limitTableSpace(<a name="line.336"></a>
-<span class="sourceLineNo">337</span>        tn2, 
SpaceQuotaHelperForTests.ONE_GIGABYTE, SpaceViolationPolicy.NO_INSERTS);<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>    admin.setQuota(settings2);<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>    // Write some data<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>    final long initialSize = 2L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    helper.writeData(tn, initialSize);<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>    LOG.info("Waiting until table size 
reflects written data");<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    // Wait until that data is seen by 
the master<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    TEST_UTIL.waitFor(30 * 1000, 500, new 
SpaceQuotaSnapshotPredicate(conn, tn) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        return snapshot.getUsage() &gt;= 
initialSize;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      }<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    });<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>    // Make sure we see the final quota 
usage size<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    waitForStableQuotaSize(conn, tn, 
null);<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>    // The actual size on disk after we 
wrote our data the first time<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    final long actualInitialSize = 
QuotaTableUtil.getCurrentSnapshot(conn, tn).getUsage();<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    LOG.info("Initial table size was " + 
actualInitialSize);<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span>    LOG.info("Snapshot the table");<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>    final String snapshot1 = 
tn.toString() + "_snapshot1";<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    admin.snapshot(snapshot1, tn);<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span>    admin.cloneSnapshot(snapshot1, 
tn2);<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>    // Write some more data to the first 
table<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    helper.writeData(tn, initialSize, 
"q2");<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    admin.flush(tn);<a 
name="line.366"></a>
+<span class="sourceLineNo">284</span>  @Test<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  public void testTablesWithSnapshots() 
throws Exception {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    final Connection conn = 
TEST_UTIL.getConnection();<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    final SpaceViolationPolicy policy = 
SpaceViolationPolicy.NO_INSERTS;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    final TableName tn = 
helper.createTableWithRegions(10);<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    // 3MB limit on the table<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>    final long tableLimit = 3L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    
TEST_UTIL.getAdmin().setQuota(QuotaSettingsFactory.limitTableSpace(tn, 
tableLimit, policy));<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>    LOG.info("Writing first data set");<a 
name="line.294"></a>
+<span class="sourceLineNo">295</span>    // Write more data than should be 
allowed and flush it to disk<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    helper.writeData(tn, 1L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE, "q1");<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>    LOG.info("Creating snapshot");<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>    
TEST_UTIL.getAdmin().snapshot(tn.toString() + "snap1", tn, 
SnapshotType.FLUSH);<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span>    LOG.info("Writing second data 
set");<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    // Write some more data<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>    helper.writeData(tn, 1L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE, "q2");<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>    LOG.info("Flushing and major 
compacting table");<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    // Compact the table to force the 
snapshot to own all of its files<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    TEST_UTIL.getAdmin().flush(tn);<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>    TEST_UTIL.compact(tn, true);<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>    LOG.info("Checking for quota 
violation");<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    // Wait to observe the quota moving 
into violation<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    TEST_UTIL.waitFor(60_000, 1_000, new 
Predicate&lt;Exception&gt;() {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      @Override<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      public boolean evaluate() throws 
Exception {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        Scan s = 
QuotaTableUtil.makeQuotaSnapshotScanForTable(tn);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        try (Table t = 
conn.getTable(QuotaTableUtil.QUOTA_TABLE_NAME)) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>          ResultScanner rs = 
t.getScanner(s);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>          try {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>            Result r = 
Iterables.getOnlyElement(rs);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>            CellScanner cs = 
r.cellScanner();<a name="line.320"></a>
+<span class="sourceLineNo">321</span>            assertTrue(cs.advance());<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>            Cell c = cs.current();<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>            SpaceQuotaSnapshot snapshot = 
SpaceQuotaSnapshot.toSpaceQuotaSnapshot(<a name="line.323"></a>
+<span class="sourceLineNo">324</span>                
QuotaProtos.SpaceQuotaSnapshot.parseFrom(<a name="line.324"></a>
+<span class="sourceLineNo">325</span>                  
UnsafeByteOperations.unsafeWrap(<a name="line.325"></a>
+<span class="sourceLineNo">326</span>                      c.getValueArray(), 
c.getValueOffset(), c.getValueLength())));<a name="line.326"></a>
+<span class="sourceLineNo">327</span>            LOG.info(<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>                snapshot.getUsage() + "/" 
+ snapshot.getLimit() + " " + snapshot.getQuotaStatus());<a name="line.328"></a>
+<span class="sourceLineNo">329</span>            // We expect to see the table 
move to violation<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            return 
snapshot.getQuotaStatus().isInViolation();<a name="line.330"></a>
+<span class="sourceLineNo">331</span>          } finally {<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>            if (null != rs) {<a 
name="line.332"></a>
+<span class="sourceLineNo">333</span>              rs.close();<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>        }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      }<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    });<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>  @Test<a name="line.341"></a>
+<span class="sourceLineNo">342</span>  public void 
testRematerializedTablesDoNoInheritSpace() throws Exception {<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>    TableName tn = 
helper.createTableWithRegions(1);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    TableName tn2 = 
helper.getNextTableName();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    LOG.info("Writing data");<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>    // Set a quota on both tables<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>    QuotaSettings settings = 
QuotaSettingsFactory.limitTableSpace(<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        tn, 
SpaceQuotaHelperForTests.ONE_GIGABYTE, SpaceViolationPolicy.NO_INSERTS);<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>    admin.setQuota(settings);<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>    QuotaSettings settings2 = 
QuotaSettingsFactory.limitTableSpace(<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        tn2, 
SpaceQuotaHelperForTests.ONE_GIGABYTE, SpaceViolationPolicy.NO_INSERTS);<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>    admin.setQuota(settings2);<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span>    // Write some data<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>    final long initialSize = 2L * 
SpaceQuotaHelperForTests.ONE_MEGABYTE;<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    helper.writeData(tn, initialSize);<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>    LOG.info("Waiting until table size 
reflects written data");<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    // Wait until that data is seen by 
the master<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    TEST_UTIL.waitFor(30 * 1000, 500, new 
SpaceQuotaSnapshotPredicate(conn, tn) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        return snapshot.getUsage() &gt;= 
initialSize;<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      }<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    });<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>    // Make sure we see the final quota 
usage size<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    waitForStableQuotaSize(conn, tn, 
null);<a name="line.366"></a>
 <span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span>    // Watch the usage of the first table 
with some more data to know when the new<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    // region size reports were sent to 
the master<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    TEST_UTIL.waitFor(30_000, 1_000, new 
SpaceQuotaSnapshotPredicate(conn, tn) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      @Override<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      boolean evaluate(SpaceQuotaSnapshot 
snapshot) throws Exception {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        return snapshot.getUsage() &gt;= 
actualInitialSize * 2;<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    });<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>    // We know that reports were sent by 
our RS, verify that they take up zero size.<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    SpaceQuotaSnapshot snapshot = 
QuotaTableUtil.getCurrentSnapshot(conn, tn2);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    assertNotNull(snapshot);<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    assertEquals(0, 
snapshot.getUsage());<a name="line.380"></a>
+<span class="sourceLineNo">368</span>    // The actual size on disk after we 
wrote our data the first time<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    final long actualInitialSize = 
QuotaTableUtil.getCurrentSnapshot(conn, tn).getUsage();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    LOG.info("Initial table size was " + 
actualInitialSize);<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>    LOG.info("Snapshot the table");<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>    final String snapshot1 = 
tn.toString() + "_snapshot1";<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    admin.snapshot(snapshot1, tn);<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span>    admin.cloneSnapshot(snapshot1, 
tn2);<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>    // Write some more data to the first 
table<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    helper.writeData(tn, initialSize, 
"q2");<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    admin.flush(tn);<a 
name="line.380"></a>
 <span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>    // Compact the cloned table to force 
it to own its own files.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    TEST_UTIL.compact(tn2, true);<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>    // After the table is compacted, it 
should have its own files and be the same size as originally<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>    TEST_UTIL.waitFor(30_000, 1_000, new 
SpaceQuotaSnapshotPredicate(conn, tn2) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      @Override<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      boolean evaluate(SpaceQuotaSnapshot 
snapshot) throws Exception {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        return snapshot.getUsage() == 
actualInitialSize;<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    });<a name="line.390"></a>
-<span class="sourceLineNo">391</span>  }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>  void waitForStableQuotaSize(Connection 
conn, TableName tn, String ns) throws Exception {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    // For some stability in the value 
before proceeding<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    // Helps make sure that we got the 
actual last value, not some inbetween<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    AtomicLong lastValue = new 
AtomicLong(-1);<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    AtomicInteger counter = new 
AtomicInteger(0);<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    TEST_UTIL.waitFor(15_000, 500, new 
SpaceQuotaSnapshotPredicate(conn, tn, ns) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        LOG.debug("Last observed size=" + 
lastValue.get());<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        if (snapshot.getUsage() == 
lastValue.get()) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>          int numMatches = 
counter.incrementAndGet();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>          if (numMatches &gt;= 5) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>            return true;<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>          }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>          // Not yet..<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>          return false;<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>        }<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        counter.set(0);<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>        
lastValue.set(snapshot.getUsage());<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        return false;<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>      }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    });<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>  long 
getRegionSizeReportForTable(Connection conn, TableName tn) throws IOException 
{<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    Map&lt;TableName,Long&gt; sizes = 
QuotaTableUtil.getMasterReportedTableSizes(conn);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    Long value = sizes.get(tn);<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>    if (null == value) {<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>      return 0L;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    }<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    return value.longValue();<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>  void 
waitForStableRegionSizeReport(Connection conn, TableName tn) throws Exception 
{<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    // For some stability in the value 
before proceeding<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    // Helps make sure that we got the 
actual last value, not some inbetween<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    AtomicLong lastValue = new 
AtomicLong(-1);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    AtomicInteger counter = new 
AtomicInteger(0);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    TEST_UTIL.waitFor(15_000, 500, new 
Predicate&lt;Exception&gt;() {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      @Override public boolean evaluate() 
throws Exception {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        LOG.debug("Last observed size=" + 
lastValue.get());<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        long actual = 
getRegionSizeReportForTable(conn, tn);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        if (actual == lastValue.get()) 
{<a name="line.434"></a>
-<span class="sourceLineNo">435</span>          int numMatches = 
counter.incrementAndGet();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>          if (numMatches &gt;= 5) {<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>            return true;<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>          }<a name="line.438"></a>
-<span class="sourceLineNo">439</span>          // Not yet..<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span>          return false;<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>        }<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        counter.set(0);<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>        lastValue.set(actual);<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>        return false;<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>      }<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>}<a name="line.448"></a>
+<span class="sourceLineNo">382</span>    // Watch the usage of the first table 
with some more data to know when the new<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    // region size reports were sent to 
the master<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    TEST_UTIL.waitFor(30_000, 1_000, new 
SpaceQuotaSnapshotPredicate(conn, tn) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>      @Override<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      boolean evaluate(SpaceQuotaSnapshot 
snapshot) throws Exception {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>        return snapshot.getUsage() &gt;= 
actualInitialSize * 2;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    });<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // We know that reports were sent by 
our RS, verify that they take up zero size.<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    SpaceQuotaSnapshot snapshot = 
QuotaTableUtil.getCurrentSnapshot(conn, tn2);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    assertNotNull(snapshot);<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>    assertEquals(0, 
snapshot.getUsage());<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>    // Compact the cloned table to force 
it to own its own files.<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    TEST_UTIL.compact(tn2, true);<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>    // After the table is compacted, it 
should have its own files and be the same size as originally<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>    TEST_UTIL.waitFor(30_000, 1_000, new 
SpaceQuotaSnapshotPredicate(conn, tn2) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      boolean evaluate(SpaceQuotaSnapshot 
snapshot) throws Exception {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>        return snapshot.getUsage() == 
actualInitialSize;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    });<a name="line.404"></a>
+<span class="sourceLineNo">405</span>  }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>  void waitForStableQuotaSize(Connection 
conn, TableName tn, String ns) throws Exception {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    // For some stability in the value 
before proceeding<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    // Helps make sure that we got the 
actual last value, not some inbetween<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    AtomicLong lastValue = new 
AtomicLong(-1);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    AtomicInteger counter = new 
AtomicInteger(0);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    TEST_UTIL.waitFor(15_000, 500, new 
SpaceQuotaSnapshotPredicate(conn, tn, ns) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      @Override boolean 
evaluate(SpaceQuotaSnapshot snapshot) throws Exception {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        LOG.debug("Last observed size=" + 
lastValue.get());<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        if (snapshot.getUsage() == 
lastValue.get()) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          int numMatches = 
counter.incrementAndGet();<a name="line.416"></a>
+<span class="sourceLineNo">417</span>          if (numMatches &gt;= 5) {<a 
name="line.417"></a>
+<span class="sourceLineNo">418</span>            return true;<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>          }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          // Not yet..<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>          return false;<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>        }<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        counter.set(0);<a 
name="line.423"></a>
+<span class="sourceLineNo">424</span>        
lastValue.set(snapshot.getUsage());<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        return false;<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>      }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    });<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>  long 
getRegionSizeReportForTable(Connection conn, TableName tn) throws IOException 
{<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    Map&lt;TableName,Long&gt; sizes = 
QuotaTableUtil.getMasterReportedTableSizes(conn);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    Long value = sizes.get(tn);<a 
name="line.432"></a>
+<span class="sourceLineNo">433</span>    if (null == value) {<a 
name="line.433"></a>
+<span class="sourceLineNo">434</span>      return 0L;<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    return value.longValue();<a 
name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>  void 
waitForStableRegionSizeReport(Connection conn, TableName tn) throws Exception 
{<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    // For some stability in the value 
before proceeding<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    // Helps make sure that we got the 
actual last value, not some inbetween<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    AtomicLong lastValue = new 
AtomicLong(-1);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    AtomicInteger counter = new 
AtomicInteger(0);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    TEST_UTIL.waitFor(15_000, 500, new 
Predicate&lt;Exception&gt;() {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      @Override public boolean evaluate() 
throws Exception {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        LOG.debug("Last observed size=" + 
lastValue.get());<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        long actual = 
getRegionSizeReportForTable(conn, tn);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        if (actual == lastValue.get()) 
{<a name="line.448"></a>
+<span class="sourceLineNo">449</span>          int numMatches = 
counter.incrementAndGet();<a name="line.449"></a>
+<span class="sourceLineNo">450</span>          if (numMatches &gt;= 5) {<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>            return true;<a 
name="line.451"></a>
+<span class="sourceLineNo">452</span>          }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>          // Not yet..<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>          return false;<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>        }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        counter.set(0);<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span>        lastValue.set(actual);<a 
name="line.457"></a>
+<span class="sourceLineNo">458</span>        return false;<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>      }<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    });<a name="line.460"></a>
+<span class="sourceLineNo">461</span>  }<a name="line.461"></a>
+<span class="sourceLineNo">462</span>}<a name="line.462"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fdcfc8d5/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
index 0e921f9..19f2eb3 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.html
@@ -36,81 +36,145 @@
 <span class="sourceLineNo">028</span><a name="line.28"></a>
 <span class="sourceLineNo">029</span>import org.apache.commons.logging.Log;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>import 
org.apache.commons.logging.LogFactory;<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.testclassification.MediumTests;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.junit.Test;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.junit.experimental.categories.Category;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * Tests for the hostname specification 
by region server<a name="line.40"></a>
-<span class="sourceLineNo">041</span> */<a name="line.41"></a>
-<span class="sourceLineNo">042</span>@Category({RegionServerTests.class, 
MediumTests.class})<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public class TestRegionServerHostname {<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>  private static final Log LOG = 
LogFactory.getLog(TestRegionServerHostname.class);<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  @Test (timeout=30000)<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>  public void 
testInvalidRegionServerHostnameAbortsServer() throws Exception {<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>    final int NUM_MASTERS = 1;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>    final int NUM_RS = 1;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>    String invalidHostname = 
"hostAddr.invalid";<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, 
invalidHostname);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    try {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    } catch (IOException ioe) {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>      Throwable t1 = ioe.getCause();<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>      Throwable t2 = t1.getCause();<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>      assertTrue(t1.getMessage() + " - " 
+ t2.getMessage(),<a name="line.58"></a>
-<span class="sourceLineNo">059</span>        t2.getMessage().contains("Failed 
resolve of " + invalidHostname) ||<a name="line.59"></a>
-<span class="sourceLineNo">060</span>        t2.getMessage().contains("Problem 
binding to " + invalidHostname));<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      return;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    } finally {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      TEST_UTIL.shutdownMiniCluster();<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>    }<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    assertTrue("Failed to validate 
against invalid hostname", false);<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  @Test(timeout=120000)<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>  public void testRegionServerHostname() 
throws Exception {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    final int NUM_MASTERS = 1;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    final int NUM_RS = 1;<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>    Enumeration&lt;NetworkInterface&gt; 
netInterfaceList = NetworkInterface.getNetworkInterfaces();<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>    while 
(netInterfaceList.hasMoreElements()) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      NetworkInterface ni = 
netInterfaceList.nextElement();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      Enumeration&lt;InetAddress&gt; 
addrList = ni.getInetAddresses();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      // iterate through host addresses 
and use each as hostname<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      while (addrList.hasMoreElements()) 
{<a name="line.78"></a>
-<span class="sourceLineNo">079</span>        InetAddress addr = 
addrList.nextElement();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        if (addr.isLoopbackAddress() || 
addr.isLinkLocalAddress() || addr.isMulticastAddress()) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>          continue;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>        String hostName = 
addr.getHostName();<a name="line.83"></a>
-<span class="sourceLineNo">084</span>        LOG.info("Found " + hostName + " 
on " + ni);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        <a name="line.85"></a>
-<span class="sourceLineNo">086</span>        
TEST_UTIL.getConfiguration().set(HRegionServer.MASTER_HOSTNAME_KEY, 
hostName);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, hostName);<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>        
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        try {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>          ZooKeeperWatcher zkw = 
TEST_UTIL.getZooKeeperWatcher();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          List&lt;String&gt; servers = 
ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          // there would be NUM_RS+1 
children - one for the master<a name="line.92"></a>
-<span class="sourceLineNo">093</span>          assertTrue(servers.size() == 
NUM_RS+1);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>          for (String server : servers) 
{<a name="line.94"></a>
-<span class="sourceLineNo">095</span>            assertTrue("From zookeeper: " 
+ server + " hostname: " + hostName,<a name="line.95"></a>
-<span class="sourceLineNo">096</span>              
server.startsWith(hostName.toLowerCase(Locale.ROOT)+","));<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>          zkw.close();<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>        } finally {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>          
TEST_UTIL.shutdownMiniCluster();<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        }<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<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">031</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.Test;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.junit.experimental.categories.Category;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Tests for the hostname specification 
by region server<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@Category({RegionServerTests.class, 
MediumTests.class})<a name="line.44"></a>
+<span class="sourceLineNo">045</span>public class TestRegionServerHostname {<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>  private static final Log LOG = 
LogFactory.getLog(TestRegionServerHostname.class);<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  @Test (timeout=30000)<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>  public void 
testInvalidRegionServerHostnameAbortsServer() throws Exception {<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>    final int NUM_MASTERS = 1;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>    final int NUM_RS = 1;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    String invalidHostname = 
"hostAddr.invalid";<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility(conf);<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, 
invalidHostname);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    try {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>      
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    } catch (IOException ioe) {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>      Throwable t1 = ioe.getCause();<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      Throwable t2 = t1.getCause();<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>      assertTrue(t1.getMessage() + " - " 
+ t2.getMessage(),<a name="line.61"></a>
+<span class="sourceLineNo">062</span>        t2.getMessage().contains("Failed 
resolve of " + invalidHostname) ||<a name="line.62"></a>
+<span class="sourceLineNo">063</span>        t2.getMessage().contains("Problem 
binding to " + invalidHostname));<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      return;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    } finally {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      TEST_UTIL.shutdownMiniCluster();<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    assertTrue("Failed to validate 
against invalid hostname", false);<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  @Test(timeout=120000)<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  public void testRegionServerHostname() 
throws Exception {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    final int NUM_MASTERS = 1;<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>    final int NUM_RS = 1;<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>    Enumeration&lt;NetworkInterface&gt; 
netInterfaceList = NetworkInterface.getNetworkInterfaces();<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility(conf);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    while 
(netInterfaceList.hasMoreElements()) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      NetworkInterface ni = 
netInterfaceList.nextElement();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      Enumeration&lt;InetAddress&gt; 
addrList = ni.getInetAddresses();<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      // iterate through host addresses 
and use each as hostname<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      while (addrList.hasMoreElements()) 
{<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        InetAddress addr = 
addrList.nextElement();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        if (addr.isLoopbackAddress() || 
addr.isLinkLocalAddress() || addr.isMulticastAddress()) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          continue;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        }<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        String hostName = 
addr.getHostName();<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        LOG.info("Found " + hostName + " 
on " + ni);<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>        
TEST_UTIL.getConfiguration().set(HRegionServer.MASTER_HOSTNAME_KEY, 
hostName);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, hostName);<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>        
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        try {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          ZooKeeperWatcher zkw = 
TEST_UTIL.getZooKeeperWatcher();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>          List&lt;String&gt; servers = 
ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>          // there would be NUM_RS+1 
children - one for the master<a name="line.96"></a>
+<span class="sourceLineNo">097</span>          assertTrue(servers.size() == 
NUM_RS+1);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>          for (String server : servers) 
{<a name="line.98"></a>
+<span class="sourceLineNo">099</span>            assertTrue("From zookeeper: " 
+ server + " hostname: " + hostName,<a name="line.99"></a>
+<span class="sourceLineNo">100</span>              
server.startsWith(hostName.toLowerCase(Locale.ROOT)+","));<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>          }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          zkw.close();<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>        } finally {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>          
TEST_UTIL.shutdownMiniCluster();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      }<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    }<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=30000)<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>  public void 
testConflictRegionServerHostnameConfigurationsAbortServer() throws Exception 
{<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    final int NUM_MASTERS = 1;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    final int NUM_RS = 1;<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    Enumeration&lt;NetworkInterface&gt; 
netInterfaceList = NetworkInterface.getNetworkInterfaces();<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility(conf);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    while 
(netInterfaceList.hasMoreElements()) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      NetworkInterface ni = 
netInterfaceList.nextElement();<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      Enumeration&lt;InetAddress&gt; 
addrList = ni.getInetAddresses();<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      // iterate through host addresses 
and use each as hostname<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      while (addrList.hasMoreElements()) 
{<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        InetAddress addr = 
addrList.nextElement();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        if (addr.isLoopbackAddress() || 
addr.isLinkLocalAddress() || addr.isMulticastAddress()) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>          continue;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        String hostName = 
addr.getHostName();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        LOG.info("Found " + hostName + " 
on " + ni);<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>        
TEST_UTIL.getConfiguration().set(HRegionServer.MASTER_HOSTNAME_KEY, 
hostName);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        // "hbase.regionserver.hostname" 
and "hbase.regionserver.hostname.disable.master.reversedns"<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>        // are mutually exclusive. 
Exception should be thrown if both are used.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        
TEST_UTIL.getConfiguration().set(HRegionServer.RS_HOSTNAME_KEY, hostName);<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>        
TEST_UTIL.getConfiguration().setBoolean(HRegionServer.RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY,
 true);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        try {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>          
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        } catch (Exception e) {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>          Throwable t1 = e.getCause();<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>          Throwable t2 = t1.getCause();<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>          assertTrue(t1.getMessage()+" - 
"+t2.getMessage(), t2.getMessage().contains(<a name="line.139"></a>
+<span class="sourceLineNo">140</span>            
HRegionServer.RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY + " and " + 
HRegionServer.RS_HOSTNAME_KEY +<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            " are mutually 
exclusive"));<a name="line.141"></a>
+<span class="sourceLineNo">142</span>          return;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        } finally {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>          
TEST_UTIL.shutdownMiniCluster();<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        assertTrue("Failed to validate 
against conflict hostname configurations", false);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>  @Test(timeout=30000)<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>  public void 
testRegionServerHostnameReportedToMaster() throws Exception {<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    final int NUM_MASTERS = 1;<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    final int NUM_RS = 1;<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    Configuration conf = 
HBaseConfiguration.create();<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility(conf);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    
TEST_UTIL.getConfiguration().setBoolean(HRegionServer.RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY,
 true);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    
TEST_UTIL.startMiniCluster(NUM_MASTERS, NUM_RS);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    try {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      ZooKeeperWatcher zkw = 
TEST_UTIL.getZooKeeperWatcher();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      List&lt;String&gt; servers = 
ZKUtil.listChildrenNoWatch(zkw, zkw.znodePaths.rsZNode);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      // there would be NUM_RS+1 children 
- one for the master<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      assertTrue(servers.size() == 
NUM_RS+1);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      zkw.close();<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    } finally {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      TEST_UTIL.shutdownMiniCluster();<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>}<a name="line.169"></a>