http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c0fcd7f3/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
index a4ec9de..dd72bc5 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
@@ -229,242 +229,251 @@
 <span class="sourceLineNo">221</span>      
ProcedureExecutor&lt;MasterProcedureEnv&gt; pe = 
this.services.getMasterProcedureExecutor();<a name="line.221"></a>
 <span class="sourceLineNo">222</span>      pe.submitProcedure(new 
GCMergedRegionsProcedure(pe.getEnvironment(),<a name="line.222"></a>
 <span class="sourceLineNo">223</span>          mergedRegion, regionA, 
regionB));<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      return true;<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    return false;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>  /**<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * Run janitorial scan of catalog 
&lt;code&gt;hbase:meta&lt;/code&gt; table looking for<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   * garbage to collect.<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>   * @return number of archiving jobs 
started.<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @throws IOException<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  int scan() throws IOException {<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>    int result = 0;<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    try {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      if 
(!alreadyRunning.compareAndSet(false, true)) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        LOG.debug("CatalogJanitor already 
running");<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        return result;<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>      }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      Triple&lt;Integer, 
Map&lt;HRegionInfo, Result&gt;, Map&lt;HRegionInfo, Result&gt;&gt; scanTriple 
=<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        
getMergedRegionsAndSplitParents();<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      /**<a name="line.244"></a>
-<span class="sourceLineNo">245</span>       * clean merge regions first<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>       */<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      Map&lt;HRegionInfo, Result&gt; 
mergedRegions = scanTriple.getSecond();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      for (Map.Entry&lt;HRegionInfo, 
Result&gt; e : mergedRegions.entrySet()) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        if 
(this.services.isInMaintenanceMode()) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          // Stop cleaning if the master 
is in maintenance mode<a name="line.250"></a>
-<span class="sourceLineNo">251</span>          break;<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>        PairOfSameType&lt;HRegionInfo&gt; 
p = MetaTableAccessor.getMergeRegions(e.getValue());<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        HRegionInfo regionA = 
p.getFirst();<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        HRegionInfo regionB = 
p.getSecond();<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        if (regionA == null || regionB == 
null) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>          LOG.warn("Unexpected references 
regionA="<a name="line.258"></a>
-<span class="sourceLineNo">259</span>              + (regionA == null ? "null" 
: regionA.getShortNameToLog())<a name="line.259"></a>
-<span class="sourceLineNo">260</span>              + ",regionB="<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>              + (regionB == null ? "null" 
: regionB.getShortNameToLog())<a name="line.261"></a>
-<span class="sourceLineNo">262</span>              + " in merged region " + 
e.getKey().getShortNameToLog());<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>          if 
(cleanMergeRegion(e.getKey(), regionA, regionB)) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>            result++;<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>       * clean split parents<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>       */<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      Map&lt;HRegionInfo, Result&gt; 
splitParents = scanTriple.getThird();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>      // Now work on our list of found 
parents. See if any we can clean up.<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      // regions whose parents are still 
around<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      HashSet&lt;String&gt; 
parentNotCleaned = new HashSet&lt;&gt;();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      for (Map.Entry&lt;HRegionInfo, 
Result&gt; e : splitParents.entrySet()) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        if 
(this.services.isInMaintenanceMode()) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>          // Stop cleaning if the master 
is in maintenance mode<a name="line.279"></a>
-<span class="sourceLineNo">280</span>          break;<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        }<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span>        if 
(!parentNotCleaned.contains(e.getKey().getEncodedName()) &amp;&amp;<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>              cleanParent(e.getKey(), 
e.getValue())) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            result++;<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>        } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>          // We could not clean the 
parent, so it's daughters should not be<a name="line.287"></a>
-<span class="sourceLineNo">288</span>          // cleaned either 
(HBASE-6160)<a name="line.288"></a>
-<span class="sourceLineNo">289</span>          
PairOfSameType&lt;HRegionInfo&gt; daughters =<a name="line.289"></a>
-<span class="sourceLineNo">290</span>              
MetaTableAccessor.getDaughterRegions(e.getValue());<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          
parentNotCleaned.add(daughters.getFirst().getEncodedName());<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>          
parentNotCleaned.add(daughters.getSecond().getEncodedName());<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>      return result;<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>    } finally {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      alreadyRunning.set(false);<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>  /**<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   * Compare HRegionInfos in a way that 
has split parents sort BEFORE their<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   * daughters.<a name="line.303"></a>
-<span class="sourceLineNo">304</span>   */<a name="line.304"></a>
-<span class="sourceLineNo">305</span>  static class SplitParentFirstComparator 
implements Comparator&lt;HRegionInfo&gt; {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    Comparator&lt;byte[]&gt; 
rowEndKeyComparator = new Bytes.RowEndKeyComparator();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    @Override<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    public int compare(HRegionInfo left, 
HRegionInfo right) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      // This comparator differs from the 
one HRegionInfo in that it sorts<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      // parent before daughters.<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>      if (left == null) return -1;<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>      if (right == null) return 1;<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>      // Same table name.<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>      int result = 
left.getTable().compareTo(right.getTable());<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      if (result != 0) return result;<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>      // Compare start keys.<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>      result = 
Bytes.compareTo(left.getStartKey(), right.getStartKey());<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      if (result != 0) return result;<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>      // Compare end keys, but flip the 
operands so parent comes first<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      result = 
rowEndKeyComparator.compare(right.getEndKey(), left.getEndKey());<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>      return result;<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>   * If daughters no longer hold 
reference to the parents, delete the parent.<a name="line.327"></a>
-<span class="sourceLineNo">328</span>   * @param parent HRegionInfo of split 
offlined parent<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * @param rowContent Content of 
&lt;code&gt;parent&lt;/code&gt; row in<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * 
&lt;code&gt;metaRegionName&lt;/code&gt;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   * @return True if we removed 
&lt;code&gt;parent&lt;/code&gt; from meta table and from<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * the filesystem.<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>   * @throws IOException<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>   */<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  boolean cleanParent(final HRegionInfo 
parent, Result rowContent)<a name="line.335"></a>
-<span class="sourceLineNo">336</span>  throws IOException {<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>    // Check whether it is a merged 
region and not clean reference<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    // No necessary to check 
MERGEB_QUALIFIER because these two qualifiers will<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    // be inserted/deleted together<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>    if 
(rowContent.getValue(HConstants.CATALOG_FAMILY, HConstants.MERGEA_QUALIFIER) != 
null) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      // wait cleaning merge region 
first<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      return false;<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    // Run checks on each daughter 
split.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    PairOfSameType&lt;HRegionInfo&gt; 
daughters = MetaTableAccessor.getDaughterRegions(rowContent);<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>    Pair&lt;Boolean, Boolean&gt; a = 
checkDaughterInFs(parent, daughters.getFirst());<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    Pair&lt;Boolean, Boolean&gt; b = 
checkDaughterInFs(parent, daughters.getSecond());<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    if (hasNoReferences(a) &amp;&amp; 
hasNoReferences(b)) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      String daughterA = 
daughters.getFirst() != null?<a name="line.349"></a>
-<span class="sourceLineNo">350</span>          
daughters.getFirst().getShortNameToLog(): "null";<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      String daughterB = 
daughters.getSecond() != null?<a name="line.351"></a>
-<span class="sourceLineNo">352</span>          
daughters.getSecond().getShortNameToLog(): "null";<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      LOG.debug("Deleting region " + 
parent.getShortNameToLog() +<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        " because daughters -- " + 
daughterA + ", " + daughterB +<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        " -- no longer hold 
references");<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      
ProcedureExecutor&lt;MasterProcedureEnv&gt; pe = 
this.services.getMasterProcedureExecutor();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      pe.submitProcedure(new 
GCRegionProcedure(pe.getEnvironment(), parent));<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      return true;<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    return false;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>  /**<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * @param p A pair where the first 
boolean says whether or not the daughter<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * region directory exists in the 
filesystem and then the second boolean says<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * whether the daughter has references 
to the parent.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   * @return True the passed 
&lt;code&gt;p&lt;/code&gt; signifies no references.<a name="line.367"></a>
-<span class="sourceLineNo">368</span>   */<a name="line.368"></a>
-<span class="sourceLineNo">369</span>  private boolean hasNoReferences(final 
Pair&lt;Boolean, Boolean&gt; p) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    return !p.getFirst() || 
!p.getSecond();<a name="line.370"></a>
-<span class="sourceLineNo">371</span>  }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>  /**<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   * Checks if a daughter region -- 
either splitA or splitB -- still holds<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * references to parent.<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>   * @param parent Parent region<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>   * @param daughter Daughter region<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>   * @return A pair where the first 
boolean says whether or not the daughter<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * region directory exists in the 
filesystem and then the second boolean says<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   * whether the daughter has references 
to the parent.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * @throws IOException<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>   */<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  Pair&lt;Boolean, Boolean&gt; 
checkDaughterInFs(final HRegionInfo parent, final HRegionInfo daughter)<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>  throws IOException {<a 
name="line.384"></a>
-<span class="sourceLineNo">385</span>    if (daughter == null)  {<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>      return new 
Pair&lt;&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>    FileSystem fs = 
this.services.getMasterFileSystem().getFileSystem();<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    Path rootdir = 
this.services.getMasterFileSystem().getRootDir();<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    Path tabledir = 
FSUtils.getTableDir(rootdir, daughter.getTable());<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    Path daughterRegionDir = new 
Path(tabledir, daughter.getEncodedName());<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span>    HRegionFileSystem regionFs = null;<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span>    try {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      if (!FSUtils.isExists(fs, 
daughterRegionDir)) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>        return new 
Pair&lt;&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    } catch (IOException ioe) {<a 
name="line.401"></a>
-<span class="sourceLineNo">402</span>      LOG.error("Error trying to 
determine if daughter region exists, " +<a name="line.402"></a>
-<span class="sourceLineNo">403</span>               "assuming exists and has 
references", ioe);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>      return new 
Pair&lt;&gt;(Boolean.TRUE, Boolean.TRUE);<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>    boolean references = false;<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>    HTableDescriptor parentDescriptor = 
getTableDescriptor(parent.getTable());<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    try {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      regionFs = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.410"></a>
-<span class="sourceLineNo">411</span>          
this.services.getConfiguration(), fs, tabledir, daughter, true);<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span>      for (HColumnDescriptor family: 
parentDescriptor.getFamilies()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        if ((references = 
regionFs.hasReferences(family.getNameAsString()))) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          break;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    } catch (IOException e) {<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>      LOG.error("Error trying to 
determine referenced files from : " + daughter.getEncodedName()<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>          + ", to: " + 
parent.getEncodedName() + " assuming has references", e);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      return new 
Pair&lt;&gt;(Boolean.TRUE, Boolean.TRUE);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    return new Pair&lt;&gt;(Boolean.TRUE, 
Boolean.valueOf(references));<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span>  private HTableDescriptor 
getTableDescriptor(final TableName tableName)<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      throws FileNotFoundException, 
IOException {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    return 
this.services.getTableDescriptors().get(tableName);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>  }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>  /**<a name="line.431"></a>
-<span class="sourceLineNo">432</span>   * Checks if the specified region has 
merge qualifiers, if so, try to clean<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   * them<a name="line.433"></a>
-<span class="sourceLineNo">434</span>   * @param region<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   * @return true if the specified region 
doesn't have merge qualifier now<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   * @throws IOException<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>   */<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  public boolean 
cleanMergeQualifier(final HRegionInfo region)<a name="line.438"></a>
-<span class="sourceLineNo">439</span>      throws IOException {<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span>    // Get merge regions if it is a 
merged region and already has merge<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    // qualifier<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    Pair&lt;HRegionInfo, HRegionInfo&gt; 
mergeRegions = MetaTableAccessor<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        
.getRegionsFromMergeQualifier(this.services.getConnection(),<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>          region.getRegionName());<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (mergeRegions == null<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>        || (mergeRegions.getFirst() == 
null &amp;&amp; mergeRegions.getSecond() == null)) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      // It doesn't have merge qualifier, 
no need to clean<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      return true;<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    // It shouldn't happen, we must 
insert/delete these two qualifiers together<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    if (mergeRegions.getFirst() == null 
|| mergeRegions.getSecond() == null) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      LOG.error("Merged region " + 
region.getRegionNameAsString()<a name="line.452"></a>
-<span class="sourceLineNo">453</span>          + " has only one merge 
qualifier in META.");<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>    return cleanMergeRegion(region, 
mergeRegions.getFirst(),<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        mergeRegions.getSecond());<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>  }<a name="line.458"></a>
-<span class="sourceLineNo">459</span>}<a name="line.459"></a>
+<span class="sourceLineNo">224</span>      // Remove from in-memory states<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>      
this.services.getAssignmentManager().getRegionStates().deleteRegion(regionA);<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>      
this.services.getAssignmentManager().getRegionStates().deleteRegion(regionB);<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>      
this.services.getServerManager().removeRegion(regionA);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      
this.services.getServerManager().removeRegion(regionB);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return true;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    return false;<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>  /**<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * Run janitorial scan of catalog 
&lt;code&gt;hbase:meta&lt;/code&gt; table looking for<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * garbage to collect.<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>   * @return number of archiving jobs 
started.<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * @throws IOException<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  int scan() throws IOException {<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    int result = 0;<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>    try {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      if 
(!alreadyRunning.compareAndSet(false, true)) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        LOG.debug("CatalogJanitor already 
running");<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        return result;<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>      }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      Triple&lt;Integer, 
Map&lt;HRegionInfo, Result&gt;, Map&lt;HRegionInfo, Result&gt;&gt; scanTriple 
=<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        
getMergedRegionsAndSplitParents();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      /**<a name="line.250"></a>
+<span class="sourceLineNo">251</span>       * clean merge regions first<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>       */<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      Map&lt;HRegionInfo, Result&gt; 
mergedRegions = scanTriple.getSecond();<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      for (Map.Entry&lt;HRegionInfo, 
Result&gt; e : mergedRegions.entrySet()) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        if 
(this.services.isInMaintenanceMode()) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          // Stop cleaning if the master 
is in maintenance mode<a name="line.256"></a>
+<span class="sourceLineNo">257</span>          break;<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>        PairOfSameType&lt;HRegionInfo&gt; 
p = MetaTableAccessor.getMergeRegions(e.getValue());<a name="line.260"></a>
+<span class="sourceLineNo">261</span>        HRegionInfo regionA = 
p.getFirst();<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        HRegionInfo regionB = 
p.getSecond();<a name="line.262"></a>
+<span class="sourceLineNo">263</span>        if (regionA == null || regionB == 
null) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span>          LOG.warn("Unexpected references 
regionA="<a name="line.264"></a>
+<span class="sourceLineNo">265</span>              + (regionA == null ? "null" 
: regionA.getShortNameToLog())<a name="line.265"></a>
+<span class="sourceLineNo">266</span>              + ",regionB="<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>              + (regionB == null ? "null" 
: regionB.getShortNameToLog())<a name="line.267"></a>
+<span class="sourceLineNo">268</span>              + " in merged region " + 
e.getKey().getShortNameToLog());<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        } else {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>          if 
(cleanMergeRegion(e.getKey(), regionA, regionB)) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>            result++;<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>          }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>        }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      }<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      /**<a name="line.275"></a>
+<span class="sourceLineNo">276</span>       * clean split parents<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>       */<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      Map&lt;HRegionInfo, Result&gt; 
splitParents = scanTriple.getThird();<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>      // Now work on our list of found 
parents. See if any we can clean up.<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      // regions whose parents are still 
around<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      HashSet&lt;String&gt; 
parentNotCleaned = new HashSet&lt;&gt;();<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      for (Map.Entry&lt;HRegionInfo, 
Result&gt; e : splitParents.entrySet()) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        if 
(this.services.isInMaintenanceMode()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>          // Stop cleaning if the master 
is in maintenance mode<a name="line.285"></a>
+<span class="sourceLineNo">286</span>          break;<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>        if 
(!parentNotCleaned.contains(e.getKey().getEncodedName()) &amp;&amp;<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>            cleanParent(e.getKey(), 
e.getValue())) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>          result++;<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        } else {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>          // We could not clean the 
parent, so it's daughters should not be<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          // cleaned either 
(HBASE-6160)<a name="line.294"></a>
+<span class="sourceLineNo">295</span>          
PairOfSameType&lt;HRegionInfo&gt; daughters =<a name="line.295"></a>
+<span class="sourceLineNo">296</span>              
MetaTableAccessor.getDaughterRegions(e.getValue());<a name="line.296"></a>
+<span class="sourceLineNo">297</span>          
parentNotCleaned.add(daughters.getFirst().getEncodedName());<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>          
parentNotCleaned.add(daughters.getSecond().getEncodedName());<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>      return result;<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    } finally {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      alreadyRunning.set(false);<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  }<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>  /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   * Compare HRegionInfos in a way that 
has split parents sort BEFORE their<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   * daughters.<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   */<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  static class SplitParentFirstComparator 
implements Comparator&lt;HRegionInfo&gt; {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    Comparator&lt;byte[]&gt; 
rowEndKeyComparator = new Bytes.RowEndKeyComparator();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    @Override<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    public int compare(HRegionInfo left, 
HRegionInfo right) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      // This comparator differs from the 
one HRegionInfo in that it sorts<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      // parent before daughters.<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>      if (left == null) return -1;<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>      if (right == null) return 1;<a 
name="line.318"></a>
+<span class="sourceLineNo">319</span>      // Same table name.<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>      int result = 
left.getTable().compareTo(right.getTable());<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      if (result != 0) return result;<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>      // Compare start keys.<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>      result = 
Bytes.compareTo(left.getStartKey(), right.getStartKey());<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      if (result != 0) return result;<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>      // Compare end keys, but flip the 
operands so parent comes first<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      result = 
rowEndKeyComparator.compare(right.getEndKey(), left.getEndKey());<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>      return result;<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  /**<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * If daughters no longer hold 
reference to the parents, delete the parent.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * @param parent HRegionInfo of split 
offlined parent<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   * @param rowContent Content of 
&lt;code&gt;parent&lt;/code&gt; row in<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   * 
&lt;code&gt;metaRegionName&lt;/code&gt;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   * @return True if we removed 
&lt;code&gt;parent&lt;/code&gt; from meta table and from<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   * the filesystem.<a 
name="line.338"></a>
+<span class="sourceLineNo">339</span>   * @throws IOException<a 
name="line.339"></a>
+<span class="sourceLineNo">340</span>   */<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  boolean cleanParent(final HRegionInfo 
parent, Result rowContent)<a name="line.341"></a>
+<span class="sourceLineNo">342</span>  throws IOException {<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>    // Check whether it is a merged 
region and not clean reference<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    // No necessary to check 
MERGEB_QUALIFIER because these two qualifiers will<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    // be inserted/deleted together<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>    if 
(rowContent.getValue(HConstants.CATALOG_FAMILY, HConstants.MERGEA_QUALIFIER) != 
null) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      // wait cleaning merge region 
first<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      return false;<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    }<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    // Run checks on each daughter 
split.<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    PairOfSameType&lt;HRegionInfo&gt; 
daughters = MetaTableAccessor.getDaughterRegions(rowContent);<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>    Pair&lt;Boolean, Boolean&gt; a = 
checkDaughterInFs(parent, daughters.getFirst());<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    Pair&lt;Boolean, Boolean&gt; b = 
checkDaughterInFs(parent, daughters.getSecond());<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    if (hasNoReferences(a) &amp;&amp; 
hasNoReferences(b)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      String daughterA = 
daughters.getFirst() != null?<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          
daughters.getFirst().getShortNameToLog(): "null";<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      String daughterB = 
daughters.getSecond() != null?<a name="line.357"></a>
+<span class="sourceLineNo">358</span>          
daughters.getSecond().getShortNameToLog(): "null";<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      LOG.debug("Deleting region " + 
parent.getShortNameToLog() +<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        " because daughters -- " + 
daughterA + ", " + daughterB +<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        " -- no longer hold 
references");<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      
ProcedureExecutor&lt;MasterProcedureEnv&gt; pe = 
this.services.getMasterProcedureExecutor();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      pe.submitProcedure(new 
GCRegionProcedure(pe.getEnvironment(), parent));<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      // Remove from in-memory states<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>      
this.services.getAssignmentManager().getRegionStates().deleteRegion(parent);<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>      
this.services.getServerManager().removeRegion(parent);<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      return true;<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    }<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    return false;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>  /**<a name="line.372"></a>
+<span class="sourceLineNo">373</span>   * @param p A pair where the first 
boolean says whether or not the daughter<a name="line.373"></a>
+<span class="sourceLineNo">374</span>   * region directory exists in the 
filesystem and then the second boolean says<a name="line.374"></a>
+<span class="sourceLineNo">375</span>   * whether the daughter has references 
to the parent.<a name="line.375"></a>
+<span class="sourceLineNo">376</span>   * @return True the passed 
&lt;code&gt;p&lt;/code&gt; signifies no references.<a name="line.376"></a>
+<span class="sourceLineNo">377</span>   */<a name="line.377"></a>
+<span class="sourceLineNo">378</span>  private boolean hasNoReferences(final 
Pair&lt;Boolean, Boolean&gt; p) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    return !p.getFirst() || 
!p.getSecond();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>  /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   * Checks if a daughter region -- 
either splitA or splitB -- still holds<a name="line.383"></a>
+<span class="sourceLineNo">384</span>   * references to parent.<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>   * @param parent Parent region<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>   * @param daughter Daughter region<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>   * @return A pair where the first 
boolean says whether or not the daughter<a name="line.387"></a>
+<span class="sourceLineNo">388</span>   * region directory exists in the 
filesystem and then the second boolean says<a name="line.388"></a>
+<span class="sourceLineNo">389</span>   * whether the daughter has references 
to the parent.<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   * @throws IOException<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>   */<a name="line.391"></a>
+<span class="sourceLineNo">392</span>  Pair&lt;Boolean, Boolean&gt; 
checkDaughterInFs(final HRegionInfo parent, final HRegionInfo daughter)<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>  throws IOException {<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>    if (daughter == null)  {<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>      return new 
Pair&lt;&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    }<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>    FileSystem fs = 
this.services.getMasterFileSystem().getFileSystem();<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    Path rootdir = 
this.services.getMasterFileSystem().getRootDir();<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    Path tabledir = 
FSUtils.getTableDir(rootdir, daughter.getTable());<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>    Path daughterRegionDir = new 
Path(tabledir, daughter.getEncodedName());<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span>    HRegionFileSystem regionFs = null;<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    try {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if (!FSUtils.isExists(fs, 
daughterRegionDir)) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        return new 
Pair&lt;&gt;(Boolean.FALSE, Boolean.FALSE);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    } catch (IOException ioe) {<a 
name="line.410"></a>
+<span class="sourceLineNo">411</span>      LOG.error("Error trying to 
determine if daughter region exists, " +<a name="line.411"></a>
+<span class="sourceLineNo">412</span>               "assuming exists and has 
references", ioe);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      return new 
Pair&lt;&gt;(Boolean.TRUE, Boolean.TRUE);<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>    boolean references = false;<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>    HTableDescriptor parentDescriptor = 
getTableDescriptor(parent.getTable());<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    try {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      regionFs = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.419"></a>
+<span class="sourceLineNo">420</span>          
this.services.getConfiguration(), fs, tabledir, daughter, true);<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>      for (HColumnDescriptor family: 
parentDescriptor.getFamilies()) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        if ((references = 
regionFs.hasReferences(family.getNameAsString()))) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span>          break;<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        }<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    } catch (IOException e) {<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>      LOG.error("Error trying to 
determine referenced files from : " + daughter.getEncodedName()<a 
name="line.428"></a>
+<span class="sourceLineNo">429</span>          + ", to: " + 
parent.getEncodedName() + " assuming has references", e);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      return new 
Pair&lt;&gt;(Boolean.TRUE, Boolean.TRUE);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    return new Pair&lt;&gt;(Boolean.TRUE, 
Boolean.valueOf(references));<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  private HTableDescriptor 
getTableDescriptor(final TableName tableName)<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      throws FileNotFoundException, 
IOException {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    return 
this.services.getTableDescriptors().get(tableName);<a name="line.437"></a>
+<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>  /**<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * Checks if the specified region has 
merge qualifiers, if so, try to clean<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * them<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @param region<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   * @return true if the specified region 
doesn't have merge qualifier now<a name="line.444"></a>
+<span class="sourceLineNo">445</span>   * @throws IOException<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>   */<a name="line.446"></a>
+<span class="sourceLineNo">447</span>  public boolean 
cleanMergeQualifier(final HRegionInfo region)<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      throws IOException {<a 
name="line.448"></a>
+<span class="sourceLineNo">449</span>    // Get merge regions if it is a 
merged region and already has merge<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // qualifier<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    Pair&lt;HRegionInfo, HRegionInfo&gt; 
mergeRegions = MetaTableAccessor<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        
.getRegionsFromMergeQualifier(this.services.getConnection(),<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>          region.getRegionName());<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>    if (mergeRegions == null<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>        || (mergeRegions.getFirst() == 
null &amp;&amp; mergeRegions.getSecond() == null)) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      // It doesn't have merge qualifier, 
no need to clean<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      return true;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    // It shouldn't happen, we must 
insert/delete these two qualifiers together<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    if (mergeRegions.getFirst() == null 
|| mergeRegions.getSecond() == null) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      LOG.error("Merged region " + 
region.getRegionNameAsString()<a name="line.461"></a>
+<span class="sourceLineNo">462</span>          + " has only one merge 
qualifier in META.");<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      return false;<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    return cleanMergeRegion(region, 
mergeRegions.getFirst(),<a name="line.465"></a>
+<span class="sourceLineNo">466</span>        mergeRegions.getSecond());<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span>  }<a name="line.467"></a>
+<span class="sourceLineNo">468</span>}<a name="line.468"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c0fcd7f3/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
index af42219..a9770f8 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html
@@ -61,32 +61,32 @@
 <span class="sourceLineNo">053</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.53"></a>
 <span class="sourceLineNo">054</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.54"></a>
 <span class="sourceLineNo">055</span>import org.apache.hadoop.fs.Path;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.ClusterStatus;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.CoordinatedStateException;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.HBaseIOException;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import 
org.apache.hadoop.hbase.HRegionInfo;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import 
org.apache.hadoop.hbase.MasterNotRunningException;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import 
org.apache.hadoop.hbase.NamespaceDescriptor;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import 
org.apache.hadoop.hbase.PleaseHoldException;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import 
org.apache.hadoop.hbase.ProcedureInfo;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import 
org.apache.hadoop.hbase.ServerLoad;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import 
org.apache.hadoop.hbase.TableDescriptors;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import 
org.apache.hadoop.hbase.TableNotDisabledException;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import 
org.apache.hadoop.hbase.UnknownRegionException;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>import 
org.apache.hadoop.hbase.client.MasterSwitchType;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.81"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.ClusterStatus;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.CoordinatedStateException;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.HBaseIOException;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.HRegionInfo;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import 
org.apache.hadoop.hbase.MasterNotRunningException;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import 
org.apache.hadoop.hbase.NamespaceDescriptor;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import 
org.apache.hadoop.hbase.PleaseHoldException;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import 
org.apache.hadoop.hbase.ProcedureInfo;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import 
org.apache.hadoop.hbase.ServerLoad;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import 
org.apache.hadoop.hbase.TableDescriptors;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import 
org.apache.hadoop.hbase.TableNotDisabledException;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import 
org.apache.hadoop.hbase.UnknownRegionException;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import 
org.apache.hadoop.hbase.client.MasterSwitchType;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import 
org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.81"></a>
 <span class="sourceLineNo">082</span>import 
org.apache.hadoop.hbase.client.TableState;<a name="line.82"></a>
 <span class="sourceLineNo">083</span>import 
org.apache.hadoop.hbase.coprocessor.BypassCoprocessorException;<a 
name="line.83"></a>
 <span class="sourceLineNo">084</span>import 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.84"></a>
@@ -172,45 +172,45 @@
 <span class="sourceLineNo">164</span>import 
org.apache.hadoop.hbase.replication.regionserver.Replication;<a 
name="line.164"></a>
 <span class="sourceLineNo">165</span>import 
org.apache.hadoop.hbase.security.AccessDeniedException;<a name="line.165"></a>
 <span class="sourceLineNo">166</span>import 
org.apache.hadoop.hbase.security.UserProvider;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;<a
 name="line.168"></a>
-<span class="sourceLineNo">169</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;<a
 name="line.169"></a>
-<span class="sourceLineNo">170</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;<a
 name="line.171"></a>
-<span class="sourceLineNo">172</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.172"></a>
-<span class="sourceLineNo">173</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>import 
org.apache.hadoop.hbase.util.Addressing;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.175"></a>
-<span class="sourceLineNo">176</span>import 
org.apache.hadoop.hbase.util.CompressionTest;<a name="line.176"></a>
-<span class="sourceLineNo">177</span>import 
org.apache.hadoop.hbase.util.EncryptionTest;<a name="line.177"></a>
-<span class="sourceLineNo">178</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>import 
org.apache.hadoop.hbase.util.HasThread;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>import 
org.apache.hadoop.hbase.util.IdLock;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>import 
org.apache.hadoop.hbase.util.ModifyRegionUtils;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>import 
org.apache.hadoop.hbase.util.VersionInfo;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>import 
org.apache.hadoop.hbase.util.ZKDataMigrator;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>import 
org.apache.hadoop.hbase.zookeeper.DrainingServerTracker;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>import 
org.apache.hadoop.hbase.zookeeper.LoadBalancerTracker;<a name="line.188"></a>
-<span class="sourceLineNo">189</span>import 
org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>import 
org.apache.hadoop.hbase.zookeeper.MasterMaintenanceModeTracker;<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>import 
org.apache.hadoop.hbase.zookeeper.RegionNormalizerTracker;<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>import 
org.apache.hadoop.hbase.zookeeper.RegionServerTracker;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>import 
org.apache.hadoop.hbase.zookeeper.SplitOrMergeTracker;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>import 
org.apache.hadoop.hbase.zookeeper.ZKClusterId;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>import 
org.apache.zookeeper.KeeperException;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>import org.eclipse.jetty.server.Server;<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>import 
org.eclipse.jetty.server.ServerConnector;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>import 
org.eclipse.jetty.servlet.ServletHolder;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>import 
org.eclipse.jetty.webapp.WebAppContext;<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.203"></a>
-<span class="sourceLineNo">204</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps;<a 
name="line.205"></a>
+<span class="sourceLineNo">167</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.167"></a>
+<span class="sourceLineNo">168</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps;<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;<a
 name="line.171"></a>
+<span class="sourceLineNo">172</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;<a
 name="line.172"></a>
+<span class="sourceLineNo">173</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;<a
 name="line.174"></a>
+<span class="sourceLineNo">175</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.175"></a>
+<span class="sourceLineNo">176</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>import 
org.apache.hadoop.hbase.util.Addressing;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>import 
org.apache.hadoop.hbase.util.CompressionTest;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>import 
org.apache.hadoop.hbase.util.EncryptionTest;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>import 
org.apache.hadoop.hbase.util.HasThread;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>import 
org.apache.hadoop.hbase.util.IdLock;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>import 
org.apache.hadoop.hbase.util.ModifyRegionUtils;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>import 
org.apache.hadoop.hbase.util.VersionInfo;<a name="line.188"></a>
+<span class="sourceLineNo">189</span>import 
org.apache.hadoop.hbase.util.ZKDataMigrator;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>import 
org.apache.hadoop.hbase.zookeeper.DrainingServerTracker;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>import 
org.apache.hadoop.hbase.zookeeper.LoadBalancerTracker;<a name="line.191"></a>
+<span class="sourceLineNo">192</span>import 
org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>import 
org.apache.hadoop.hbase.zookeeper.MasterMaintenanceModeTracker;<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>import 
org.apache.hadoop.hbase.zookeeper.RegionNormalizerTracker;<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>import 
org.apache.hadoop.hbase.zookeeper.RegionServerTracker;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>import 
org.apache.hadoop.hbase.zookeeper.SplitOrMergeTracker;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>import 
org.apache.hadoop.hbase.zookeeper.ZKClusterId;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>import 
org.apache.zookeeper.KeeperException;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>import org.eclipse.jetty.server.Server;<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>import 
org.eclipse.jetty.server.ServerConnector;<a name="line.202"></a>
+<span class="sourceLineNo">203</span>import 
org.eclipse.jetty.servlet.ServletHolder;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>import 
org.eclipse.jetty.webapp.WebAppContext;<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
 <span class="sourceLineNo">206</span>import com.google.protobuf.Descriptors;<a 
name="line.206"></a>
 <span class="sourceLineNo">207</span>import com.google.protobuf.Service;<a 
name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
@@ -1945,14 +1945,14 @@
 <span class="sourceLineNo">1937</span>      }<a name="line.1937"></a>
 <span class="sourceLineNo">1938</span><a name="line.1938"></a>
 <span class="sourceLineNo">1939</span>      // 3. blocking file count<a 
name="line.1939"></a>
-<span class="sourceLineNo">1940</span>      String sbfc = 
htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);<a 
name="line.1940"></a>
-<span class="sourceLineNo">1941</span>      if (sbfc != null) {<a 
name="line.1941"></a>
-<span class="sourceLineNo">1942</span>        blockingFileCount = 
Integer.parseInt(sbfc);<a name="line.1942"></a>
+<span class="sourceLineNo">1940</span>      sv = 
hcd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);<a 
name="line.1940"></a>
+<span class="sourceLineNo">1941</span>      if (sv != null) {<a 
name="line.1941"></a>
+<span class="sourceLineNo">1942</span>        blockingFileCount = 
Integer.parseInt(sv);<a name="line.1942"></a>
 <span class="sourceLineNo">1943</span>      }<a name="line.1943"></a>
 <span class="sourceLineNo">1944</span>      if (blockingFileCount &lt; 1000) 
{<a name="line.1944"></a>
 <span class="sourceLineNo">1945</span>        message =<a name="line.1945"></a>
-<span class="sourceLineNo">1946</span>            "blocking file count '" + 
HStore.BLOCKING_STOREFILES_KEY + "' " + blockingFileCount<a 
name="line.1946"></a>
-<span class="sourceLineNo">1947</span>                + " is below recommended 
minimum of 1000";<a name="line.1947"></a>
+<span class="sourceLineNo">1946</span>            "Blocking file count '" + 
HStore.BLOCKING_STOREFILES_KEY + "' " + blockingFileCount<a 
name="line.1946"></a>
+<span class="sourceLineNo">1947</span>                + " is below recommended 
minimum of 1000 for column family "+ hcd.getNameAsString();<a 
name="line.1947"></a>
 <span class="sourceLineNo">1948</span>        throw new 
IOException(message);<a name="line.1948"></a>
 <span class="sourceLineNo">1949</span>      }<a name="line.1949"></a>
 <span class="sourceLineNo">1950</span>    }<a name="line.1950"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c0fcd7f3/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
index af42219..a9770f8 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.RedirectServlet.html
@@ -61,32 +61,32 @@
 <span class="sourceLineNo">053</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.53"></a>
 <span class="sourceLineNo">054</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.54"></a>
 <span class="sourceLineNo">055</span>import org.apache.hadoop.fs.Path;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.ClusterStatus;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.CoordinatedStateException;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.HBaseIOException;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import 
org.apache.hadoop.hbase.HRegionInfo;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import 
org.apache.hadoop.hbase.MasterNotRunningException;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import 
org.apache.hadoop.hbase.NamespaceDescriptor;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import 
org.apache.hadoop.hbase.PleaseHoldException;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import 
org.apache.hadoop.hbase.ProcedureInfo;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import 
org.apache.hadoop.hbase.ServerLoad;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import 
org.apache.hadoop.hbase.TableDescriptors;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import 
org.apache.hadoop.hbase.TableNotDisabledException;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import 
org.apache.hadoop.hbase.UnknownRegionException;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>import 
org.apache.hadoop.hbase.client.MasterSwitchType;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.81"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.ClusterStatus;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.CoordinatedStateException;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.HBaseIOException;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.hadoop.hbase.HRegionInfo;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import 
org.apache.hadoop.hbase.MasterNotRunningException;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import 
org.apache.hadoop.hbase.NamespaceDescriptor;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import 
org.apache.hadoop.hbase.PleaseHoldException;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import 
org.apache.hadoop.hbase.ProcedureInfo;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import 
org.apache.hadoop.hbase.ServerLoad;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import 
org.apache.hadoop.hbase.TableDescriptors;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import 
org.apache.hadoop.hbase.TableNotDisabledException;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import 
org.apache.hadoop.hbase.UnknownRegionException;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import 
org.apache.hadoop.hbase.client.MasterSwitchType;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import 
org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.81"></a>
 <span class="sourceLineNo">082</span>import 
org.apache.hadoop.hbase.client.TableState;<a name="line.82"></a>
 <span class="sourceLineNo">083</span>import 
org.apache.hadoop.hbase.coprocessor.BypassCoprocessorException;<a 
name="line.83"></a>
 <span class="sourceLineNo">084</span>import 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.84"></a>
@@ -172,45 +172,45 @@
 <span class="sourceLineNo">164</span>import 
org.apache.hadoop.hbase.replication.regionserver.Replication;<a 
name="line.164"></a>
 <span class="sourceLineNo">165</span>import 
org.apache.hadoop.hbase.security.AccessDeniedException;<a name="line.165"></a>
 <span class="sourceLineNo">166</span>import 
org.apache.hadoop.hbase.security.UserProvider;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;<a
 name="line.168"></a>
-<span class="sourceLineNo">169</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;<a
 name="line.169"></a>
-<span class="sourceLineNo">170</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;<a
 name="line.171"></a>
-<span class="sourceLineNo">172</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.172"></a>
-<span class="sourceLineNo">173</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>import 
org.apache.hadoop.hbase.util.Addressing;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.175"></a>
-<span class="sourceLineNo">176</span>import 
org.apache.hadoop.hbase.util.CompressionTest;<a name="line.176"></a>
-<span class="sourceLineNo">177</span>import 
org.apache.hadoop.hbase.util.EncryptionTest;<a name="line.177"></a>
-<span class="sourceLineNo">178</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>import 
org.apache.hadoop.hbase.util.HasThread;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>import 
org.apache.hadoop.hbase.util.IdLock;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>import 
org.apache.hadoop.hbase.util.ModifyRegionUtils;<a name="line.182"></a>
-<span class="sourceLineNo">183</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>import 
org.apache.hadoop.hbase.util.VersionInfo;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>import 
org.apache.hadoop.hbase.util.ZKDataMigrator;<a name="line.186"></a>
-<span class="sourceLineNo">187</span>import 
org.apache.hadoop.hbase.zookeeper.DrainingServerTracker;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>import 
org.apache.hadoop.hbase.zookeeper.LoadBalancerTracker;<a name="line.188"></a>
-<span class="sourceLineNo">189</span>import 
org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>import 
org.apache.hadoop.hbase.zookeeper.MasterMaintenanceModeTracker;<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>import 
org.apache.hadoop.hbase.zookeeper.RegionNormalizerTracker;<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>import 
org.apache.hadoop.hbase.zookeeper.RegionServerTracker;<a name="line.192"></a>
-<span class="sourceLineNo">193</span>import 
org.apache.hadoop.hbase.zookeeper.SplitOrMergeTracker;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>import 
org.apache.hadoop.hbase.zookeeper.ZKClusterId;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>import 
org.apache.zookeeper.KeeperException;<a name="line.197"></a>
-<span class="sourceLineNo">198</span>import org.eclipse.jetty.server.Server;<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>import 
org.eclipse.jetty.server.ServerConnector;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>import 
org.eclipse.jetty.servlet.ServletHolder;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>import 
org.eclipse.jetty.webapp.WebAppContext;<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.203"></a>
-<span class="sourceLineNo">204</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps;<a 
name="line.205"></a>
+<span class="sourceLineNo">167</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a
 name="line.167"></a>
+<span class="sourceLineNo">168</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Maps;<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;<a
 name="line.171"></a>
+<span class="sourceLineNo">172</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;<a
 name="line.172"></a>
+<span class="sourceLineNo">173</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;<a
 name="line.174"></a>
+<span class="sourceLineNo">175</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.175"></a>
+<span class="sourceLineNo">176</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>import 
org.apache.hadoop.hbase.util.Addressing;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>import 
org.apache.hadoop.hbase.util.CompressionTest;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>import 
org.apache.hadoop.hbase.util.EncryptionTest;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.181"></a>
+<span class="sourceLineNo">182</span>import 
org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>import 
org.apache.hadoop.hbase.util.HasThread;<a name="line.183"></a>
+<span class="sourceLineNo">184</span>import 
org.apache.hadoop.hbase.util.IdLock;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>import 
org.apache.hadoop.hbase.util.ModifyRegionUtils;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.186"></a>
+<span class="sourceLineNo">187</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.187"></a>
+<span class="sourceLineNo">188</span>import 
org.apache.hadoop.hbase.util.VersionInfo;<a name="line.188"></a>
+<span class="sourceLineNo">189</span>import 
org.apache.hadoop.hbase.util.ZKDataMigrator;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>import 
org.apache.hadoop.hbase.zookeeper.DrainingServerTracker;<a name="line.190"></a>
+<span class="sourceLineNo">191</span>import 
org.apache.hadoop.hbase.zookeeper.LoadBalancerTracker;<a name="line.191"></a>
+<span class="sourceLineNo">192</span>import 
org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>import 
org.apache.hadoop.hbase.zookeeper.MasterMaintenanceModeTracker;<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>import 
org.apache.hadoop.hbase.zookeeper.RegionNormalizerTracker;<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>import 
org.apache.hadoop.hbase.zookeeper.RegionServerTracker;<a name="line.195"></a>
+<span class="sourceLineNo">196</span>import 
org.apache.hadoop.hbase.zookeeper.SplitOrMergeTracker;<a name="line.196"></a>
+<span class="sourceLineNo">197</span>import 
org.apache.hadoop.hbase.zookeeper.ZKClusterId;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>import 
org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>import 
org.apache.zookeeper.KeeperException;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>import org.eclipse.jetty.server.Server;<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>import 
org.eclipse.jetty.server.ServerConnector;<a name="line.202"></a>
+<span class="sourceLineNo">203</span>import 
org.eclipse.jetty.servlet.ServletHolder;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>import 
org.eclipse.jetty.webapp.WebAppContext;<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
 <span class="sourceLineNo">206</span>import com.google.protobuf.Descriptors;<a 
name="line.206"></a>
 <span class="sourceLineNo">207</span>import com.google.protobuf.Service;<a 
name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
@@ -1945,14 +1945,14 @@
 <span class="sourceLineNo">1937</span>      }<a name="line.1937"></a>
 <span class="sourceLineNo">1938</span><a name="line.1938"></a>
 <span class="sourceLineNo">1939</span>      // 3. blocking file count<a 
name="line.1939"></a>
-<span class="sourceLineNo">1940</span>      String sbfc = 
htd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);<a 
name="line.1940"></a>
-<span class="sourceLineNo">1941</span>      if (sbfc != null) {<a 
name="line.1941"></a>
-<span class="sourceLineNo">1942</span>        blockingFileCount = 
Integer.parseInt(sbfc);<a name="line.1942"></a>
+<span class="sourceLineNo">1940</span>      sv = 
hcd.getConfigurationValue(HStore.BLOCKING_STOREFILES_KEY);<a 
name="line.1940"></a>
+<span class="sourceLineNo">1941</span>      if (sv != null) {<a 
name="line.1941"></a>
+<span class="sourceLineNo">1942</span>        blockingFileCount = 
Integer.parseInt(sv);<a name="line.1942"></a>
 <span class="sourceLineNo">1943</span>      }<a name="line.1943"></a>
 <span class="sourceLineNo">1944</span>      if (blockingFileCount &lt; 1000) 
{<a name="line.1944"></a>
 <span class="sourceLineNo">1945</span>        message =<a name="line.1945"></a>
-<span class="sourceLineNo">1946</span>            "blocking file count '" + 
HStore.BLOCKING_STOREFILES_KEY + "' " + blockingFileCount<a 
name="line.1946"></a>
-<span class="sourceLineNo">1947</span>                + " is below recommended 
minimum of 1000";<a name="line.1947"></a>
+<span class="sourceLineNo">1946</span>            "Blocking file count '" + 
HStore.BLOCKING_STOREFILES_KEY + "' " + blockingFileCount<a 
name="line.1946"></a>
+<span class="sourceLineNo">1947</span>                + " is below recommended 
minimum of 1000 for column family "+ hcd.getNameAsString();<a 
name="line.1947"></a>
 <span class="sourceLineNo">1948</span>        throw new 
IOException(message);<a name="line.1948"></a>
 <span class="sourceLineNo">1949</span>      }<a name="line.1949"></a>
 <span class="sourceLineNo">1950</span>    }<a name="line.1950"></a>

Reply via email to